diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 105bca2..c9ac6cb 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveDateTime="2023-05-31T18:02:12" projectname="Gun Run" version="3.30.3-'s-Hertogenbosch" saveUserFull="Timothy Allen" saveUser="tim">
+<qgis saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run" version="3.32.0-Lima" saveDateTime="2023-07-08T16:34:10">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,16 +17,16 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer edl-is-active="1" edl-distance-unit="0" light-azimuth="315" combined-method="0" edl-strength="1000" edl-distance="0.5" hillshading-is-active="0" is-active="0" hillshading-z-factor="1" light-altitude="45" hillshading-is-multidirectional="0"/>
+  <elevation-shading-renderer is-active="0" edl-distance-unit="0" edl-distance="0.5" light-azimuth="315" edl-strength="1000" hillshading-is-multidirectional="0" edl-is-active="1" hillshading-z-factor="1" light-altitude="45" hillshading-is-active="0" combined-method="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="marshal_positions" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_positions [456]" type="QString"/>
@@ -37,7 +37,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" id="extra_security20170921130834191" expanded="1" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="extra_security" expanded="1" source="./extra_security.shp" id="extra_security20170921130834191" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="extra_security" type="QString"/>
@@ -45,7 +45,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" id="marshals_by_position20161003112326575" expanded="1" legend_exp="" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="delimitedtext">
+      <layer-tree-layer name="marshals_by_position" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" checked="Qt::Unchecked" providerKey="delimitedtext" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshals_by_position [457]" type="QString"/>
@@ -53,14 +53,14 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="complete_marshal_overview" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="complete_marshal_overview" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="marshal_overviews" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_overviews" type="QString"/>
@@ -74,7 +74,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fencing" type="QString"/>
@@ -84,14 +84,14 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="cone_only_groups" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" expanded="1" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="cone_only_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="cone_only_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_and_cone_groups" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="fence_and_cone_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fence_and_cone_groups" type="QString"/>
@@ -107,7 +107,7 @@
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer name="route_markers" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" legend_exp="" patch_size="-1,-1" source="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" checked="Qt::Checked" legend_split_behavior="0" providerKey="memory">
+        <layer-tree-layer name="route_markers" expanded="1" source="Point?crs=EPSG:4326&amp;uid={88febb57-a4fc-4274-be6f-cad02f20fac0}" id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" checked="Qt::Checked" providerKey="memory" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
           <customproperties>
             <Option type="Map">
               <Option name="showFeatureCount" value="1" type="int"/>
@@ -115,7 +115,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="all_routes" type="QString"/>
@@ -125,7 +125,7 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_exp="" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+    <layer-tree-layer name="timelapse" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
       <customproperties>
         <Option type="Map">
           <Option name="cached_name" value="timelapse" type="QString"/>
@@ -136,7 +136,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="water_tables" id="water_tables20170921142016467" expanded="1" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="water_tables" expanded="1" source="./water_tables.shp" id="water_tables20170921142016467" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="water_tables" type="QString"/>
@@ -149,14 +149,14 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="directions_to_start" type="QString"/>
@@ -168,14 +168,14 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="mayor" expanded="1" source="./mayor.shp" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="viplabels" expanded="1" source="./viplabels.shp" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="viplabels" type="QString"/>
@@ -183,7 +183,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="vipaccess" expanded="1" source="./vipaccess.shp" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="vipaccess" type="QString"/>
@@ -191,12 +191,12 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="golfaccess" expanded="0" source="./golfaccess.shp" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="residents_access_roads" type="QString"/>
@@ -204,7 +204,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="residents_access" expanded="1" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
@@ -214,7 +214,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="osm_roads" expanded="0" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
@@ -223,7 +223,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="osm_places" expanded="1" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_places [7]" type="QString"/>
@@ -237,7 +237,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="data-comments" expanded="1" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="data-comments" type="QString"/>
@@ -245,7 +245,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="start_finish_area" expanded="1" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="start_finish_area" type="QString"/>
@@ -258,7 +258,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="capetownelevation-1m" expanded="1" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="showFeatureCount" value="1" type="QString"/>
@@ -270,7 +270,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="gdal">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Unchecked" providerKey="gdal" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
@@ -278,7 +278,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_exp="" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_split_behavior="0" providerKey="wms">
+      <layer-tree-layer name="Outlines" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" checked="Qt::Checked" providerKey="wms" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="Outlines" type="QString"/>
@@ -313,35 +313,35 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</item>
+      <item>route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings tolerance="10" scaleDependencyMode="0" mode="3" self-snapping="1" maxScale="0" type="1" enabled="0" intersection-snapping="1" unit="1" minScale="0">
+  <snapping-settings intersection-snapping="1" maxScale="0" mode="3" self-snapping="1" scaleDependencyMode="0" tolerance="10" unit="1" enabled="0" type="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" enabled="0" minScale="0"/>
-      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" enabled="1" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" enabled="0" minScale="0"/>
+      <layer-setting id="water_tables20170921142016467" units="2" maxScale="0" tolerance="0" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="extra_security20170921130834191" units="2" maxScale="0" tolerance="0" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" maxScale="0" tolerance="12" enabled="0" type="0" minScale="0"/>
+      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" maxScale="0" tolerance="12" enabled="0" type="0" minScale="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" maxScale="0" tolerance="20" enabled="1" type="2" minScale="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -349,10 +349,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39262360336048019</xmin>
-      <ymin>-33.91377785181562388</ymin>
-      <xmax>18.42086732654766834</xmax>
-      <ymax>-33.89897949390747556</ymax>
+      <xmin>18.40581914754706006</xmin>
+      <ymin>-33.9558782781264199</ymin>
+      <xmax>18.41832465005257902</xmax>
+      <ymax>-33.94090179651766448</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -373,166 +373,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="Marshals" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Marshals" checked="Qt::Unchecked" open="true">
+      <legendlayer name="marshal_positions" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="marshal_overviews" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="cone_only_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_and_cone_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer name="water_tables" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" checked="Qt::Checked" drawingOrder="-1" open="false" showFeatureCount="1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="0">
+  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="annotation" minScale="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -593,7 +593,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="raster" minScale="1e+08" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -648,7 +648,7 @@
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt></wkt>
-            <proj4></proj4>
+            <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs</proj4>
             <srsid>0</srsid>
             <srid>0</srid>
             <authid></authid>
@@ -659,7 +659,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -684,13 +684,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
+      <elevation zscale="1" zoffset="0" enabled="0" symbology="Line" band="1">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -699,7 +699,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -707,7 +707,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -748,7 +748,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -756,7 +756,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -792,7 +792,7 @@
           <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
           <Option name="name" value="" type="QString"/>
@@ -802,9 +802,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" blueBand="3" redBand="1" greenBand="2" type="multibandcolor" nodataColor="">
+        <rasterrenderer opacity="0.5" greenBand="2" blueBand="3" nodataColor="" redBand="1" alphaBand="-1" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -815,14 +815,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation invertColors="0" colorizeOn="0" colorizeGreen="128" grayscaleMode="0" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="raster" minScale="1e+08" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -888,7 +888,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -911,13 +911,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
+      <elevation zscale="1" zoffset="0" enabled="0" symbology="Line" band="1">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -926,7 +926,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -934,7 +934,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -975,7 +975,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -983,7 +983,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1019,7 +1019,7 @@
           <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
           <Option name="name" value="" type="QString"/>
@@ -1029,9 +1029,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer opacity="0.75" nodataColor="" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1042,14 +1042,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation invertColors="0" colorizeOn="0" colorizeGreen="128" grayscaleMode="0" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1115,7 +1115,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1129,8 +1129,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_km" expression="$length * 100" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="length_m" expression="$length * 100 * 1000" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1143,13 +1143,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="RouteLen" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="RouteLen">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -1158,7 +1158,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1166,7 +1166,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1207,7 +1207,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1215,7 +1215,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1240,7 +1240,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1248,7 +1248,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -1281,19 +1281,19 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Show by day">
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" checkstate="0"/>
+          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Show by day" symbol="0">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" symbol="1"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" symbol="2"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends" label="5KM" symbol="3"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="Trail" symbol="4"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show" checkstate="0"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Always show by day" checkstate="0"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" symbol="5"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1301,7 +1301,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1338,7 +1338,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1346,7 +1346,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1368,7 +1368,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1376,7 +1376,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -1408,7 +1408,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1457,7 +1457,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1483,7 +1483,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1491,7 +1491,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1529,7 +1529,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1555,7 +1555,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1563,7 +1563,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1602,7 +1602,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1610,7 +1610,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1647,7 +1647,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1655,7 +1655,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1677,7 +1677,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1685,7 +1685,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -1717,7 +1717,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1766,7 +1766,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1792,7 +1792,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1800,7 +1800,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1838,7 +1838,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1864,7 +1864,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1872,7 +1872,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1911,7 +1911,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1919,7 +1919,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1956,7 +1956,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1964,7 +1964,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -1986,7 +1986,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1994,7 +1994,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2026,7 +2026,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2075,7 +2075,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2101,7 +2101,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2109,7 +2109,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2147,7 +2147,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2173,7 +2173,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2181,7 +2181,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2220,7 +2220,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2228,7 +2228,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2265,7 +2265,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2273,7 +2273,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -2295,7 +2295,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@3@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2303,7 +2303,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2335,7 +2335,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2384,7 +2384,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2410,7 +2410,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2418,7 +2418,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2456,7 +2456,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2482,7 +2482,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2490,7 +2490,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2529,7 +2529,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2537,7 +2537,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2574,7 +2574,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2582,7 +2582,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -2604,7 +2604,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@4@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2612,7 +2612,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2644,7 +2644,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2693,7 +2693,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2719,7 +2719,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2727,7 +2727,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" pass="0" locked="0" enabled="1">
                   <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 id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2791,7 +2791,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2799,7 +2799,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2838,7 +2838,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2846,7 +2846,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2891,7 +2891,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="6" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="6" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2899,7 +2899,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2946,19 +2946,19 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{1e5906eb-3293-40e6-9693-aecca72e6ace}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round($length / 1000, 0)" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2966,7 +2966,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -2997,7 +2997,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3005,7 +3005,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -3040,7 +3040,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3050,9 +3050,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="1" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="1" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -3103,7 +3103,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -3117,14 +3117,14 @@
               </callout>
             </settings>
           </rule>
-          <rule description="Route lengths" key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" active="0">
+          <rule key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" description="Route lengths" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100, 4 )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3132,7 +3132,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -3163,7 +3163,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3171,7 +3171,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -3206,7 +3206,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3216,9 +3216,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapAtNoCost" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapAtNoCost" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -3269,7 +3269,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -3308,12 +3308,12 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <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 id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -3363,7 +3363,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -3376,10 +3376,10 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3389,7 +3389,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3399,7 +3399,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3409,7 +3409,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3419,7 +3419,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3429,7 +3429,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3439,7 +3439,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3449,7 +3449,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3459,21 +3459,21 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3483,7 +3483,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3495,32 +3495,32 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="Sort" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -3537,18 +3537,18 @@
         <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -3565,27 +3565,27 @@
         <constraint field="length_m" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_km" expression="$length * 100" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="length_m" expression="$length * 100 * 1000" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Name" width="152" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="163" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="188" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="266" type="field" hidden="0"/>
+          <column name="Name" width="152" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="begin" width="163" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="188" hidden="0" type="field"/>
+          <column name="Sort" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="266" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3661,9 +3661,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3737,13 +3737,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -3752,7 +3752,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3760,7 +3760,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3801,7 +3801,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3809,7 +3809,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -3834,7 +3834,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3842,7 +3842,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -3875,9 +3875,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3885,7 +3885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3942,24 +3942,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -3968,14 +3968,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias field="ID" name="" index="0"/>
+        <alias field="height" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="ID"/>
-        <policy policy="Duplicate" field="height"/>
-        <policy policy="Duplicate" field="elevation"/>
+        <policy field="ID" policy="Duplicate"/>
+        <policy field="height" policy="Duplicate"/>
+        <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="ID" expression="" applyOnUpdate="0"/>
@@ -3983,9 +3983,9 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="ID" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="height" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="elevation" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" exp="" desc=""/>
@@ -4017,9 +4017,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression></previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4095,13 +4095,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4110,7 +4110,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4118,7 +4118,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4159,7 +4159,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4167,7 +4167,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4192,7 +4192,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4200,7 +4200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -4233,9 +4233,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4243,7 +4243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4286,31 +4286,31 @@ def my_form_open(dialog, layer, feature):
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -4319,16 +4319,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="page"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="page" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -4337,10 +4337,10 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -4373,9 +4373,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression></previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4451,13 +4451,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4466,7 +4466,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4474,7 +4474,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4515,7 +4515,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4523,7 +4523,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4548,7 +4548,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4556,7 +4556,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -4589,9 +4589,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4599,7 +4599,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4639,12 +4639,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" enabled="0" showAxis="1" opacity="1" penWidth="0" penColor="#000000" direction="0" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="1" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="5" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -4652,7 +4652,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -4694,7 +4694,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4713,38 +4713,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4753,18 +4753,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
+        <alias field="cone_len" name="" index="4"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="name" expression="" applyOnUpdate="0"/>
@@ -4774,11 +4774,11 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -4793,12 +4793,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" width="306" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4853,9 +4853,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4921,7 +4921,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4946,13 +4946,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4961,7 +4961,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4969,7 +4969,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5010,7 +5010,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5018,7 +5018,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5043,7 +5043,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5051,7 +5051,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -5084,9 +5084,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5094,7 +5094,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5139,12 +5139,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="Name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="Name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5152,7 +5152,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -5176,7 +5176,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5186,9 +5186,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="LineGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -5208,7 +5208,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -5236,12 +5236,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -5249,7 +5249,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -5291,7 +5291,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -5304,17 +5304,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -5323,20 +5323,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Name" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="Name"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5348,9 +5348,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5393,9 +5393,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>Name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5461,7 +5461,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5486,13 +5486,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -5501,7 +5501,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5509,7 +5509,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5550,7 +5550,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5558,7 +5558,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5583,7 +5583,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5591,7 +5591,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -5624,14 +5624,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" symbol="0"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" symbol="1"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5639,7 +5639,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5665,7 +5665,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5673,7 +5673,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5705,7 +5705,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5742,7 +5742,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5750,7 +5750,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -5772,7 +5772,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5780,7 +5780,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -5806,7 +5806,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -5845,7 +5845,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5853,7 +5853,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5890,7 +5890,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5898,7 +5898,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -5920,7 +5920,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5928,7 +5928,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -5954,7 +5954,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5991,7 +5991,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5999,7 +5999,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -6021,7 +6021,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6029,7 +6029,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6055,7 +6055,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -6094,7 +6094,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6102,7 +6102,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6139,7 +6139,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6147,7 +6147,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -6169,7 +6169,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6177,7 +6177,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6203,7 +6203,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6240,7 +6240,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6248,7 +6248,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -6270,7 +6270,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6278,7 +6278,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6304,7 +6304,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -6345,7 +6345,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -6362,12 +6362,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6375,7 +6375,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -6417,7 +6417,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6430,17 +6430,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -6452,20 +6452,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Distance" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="Distance"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -6477,9 +6477,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6540,9 +6540,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6616,13 +6616,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6631,7 +6631,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6639,7 +6639,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6680,7 +6680,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6688,7 +6688,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6713,7 +6713,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6721,7 +6721,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6754,9 +6754,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.796078" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.796078">
             <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 id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6807,14 +6807,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6822,7 +6822,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6852,7 +6852,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6888,9 +6888,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="1" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6941,7 +6941,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -6955,14 +6955,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="4" textOrientation="horizontal" fontKerning="1" textColor="227,0,185,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="4" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="227,0,185,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6970,7 +6970,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -7000,7 +7000,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -7021,9 +7021,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7059,7 +7059,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -7223,12 +7223,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7236,7 +7236,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7278,7 +7278,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="10" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="10" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7291,10 +7291,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7304,7 +7304,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7314,7 +7314,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7326,14 +7326,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -7341,9 +7341,9 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -7356,10 +7356,10 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7433,9 +7433,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip>name</mapTip>
+      <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7501,7 +7501,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7530,13 +7530,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7545,7 +7545,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7553,7 +7553,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7594,7 +7594,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7602,7 +7602,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -7627,7 +7627,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7635,7 +7635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7668,9 +7668,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7678,7 +7678,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -7721,12 +7721,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7734,7 +7734,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7776,7 +7776,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7795,45 +7795,45 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7842,20 +7842,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
+        <alias field="cone_len" name="" index="4"/>
+        <alias field="fence_len" name="" index="5"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
-        <policy policy="Duplicate" field="fence_len"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
+        <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="name" expression="" applyOnUpdate="0"/>
@@ -7866,12 +7866,12 @@ def my_form_open(dialog, layer, feature):
         <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -7887,13 +7887,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="name" width="415" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column name="name" width="415" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="fence_len" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7951,9 +7951,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8019,7 +8019,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8033,42 +8033,42 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" minScale="1e+08">
+          <qgis labelsEnabled="1" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyAlgorithm="0" readOnly="0" version="3.8.3-Zanzibar" minScale="1e+08" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyMaxScale="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" enableorderby="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" alpha="1" type="line" force_rhr="0">
-                  <layer locked="0" enabled="1" pass="0" class="SimpleLine">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                  <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8084,15 +8084,15 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontSizeUnit="Point" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="comment" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
-                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                    <text-style multilineHeight="1" fontSize="11" namedStyle="Regular" textOpacity="0.8" blendMode="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" fontItalic="0" fontLetterSpacing="0" fieldName="comment" textColor="0,0,0,255" previewBkgrdColor="#ffffff" fontCapitals="0" useSubstitutions="0" isExpression="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                      <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeType="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeX="1"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="2" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="5" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="4" geometryGeneratorEnabled="0" offsetType="0"/>
-                    <rendering displayAll="1" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                    <text-format plussign="0" multilineAlign="4294967295" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" preserveRotation="1" distUnits="MM" maxCurvedCharAngleIn="25" geometryGenerator="" offsetUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" centroidInside="0" repeatDistance="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" centroidWhole="0" xOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="5" rotationAngle="0" yOffset="0" geometryGeneratorEnabled="0" offsetType="0" fitInPolygonOnly="0" placement="4" priority="5" quadOffset="4"/>
+                    <rendering displayAll="1" labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8115,15 +8115,15 @@ def my_form_open(dialog, layer, feature):
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
-                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                    <text-style multilineHeight="1" fontSize="12" namedStyle="Semibold" textOpacity="1" blendMode="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" fontItalic="0" fontLetterSpacing="0" fieldName="round( $length, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="#ffffff" fontCapitals="0" useSubstitutions="0" isExpression="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                      <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="15" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="1" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="2" geometryGeneratorEnabled="0" offsetType="0"/>
-                    <rendering displayAll="0" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                    <text-format plussign="0" multilineAlign="4294967295" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" preserveRotation="1" distUnits="MM" maxCurvedCharAngleIn="25" geometryGenerator="" offsetUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" centroidInside="0" repeatDistance="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" centroidWhole="0" xOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="1" rotationAngle="0" yOffset="0" geometryGeneratorEnabled="0" offsetType="0" fitInPolygonOnly="0" placement="2" priority="5" quadOffset="4"/>
+                    <rendering displayAll="0" labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8155,13 +8155,13 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory scaleDependency="Area" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" enabled="0" opacity="1" penWidth="0" diagramOrientation="Up" penColor="#000000" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" width="15" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory penWidth="0" penColor="#000000" scaleDependency="Area" backgroundAlpha="255" rotationOffset="270" labelPlacementMethod="XHeight" opacity="1" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" height="15" backgroundColor="#ffffff" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" width="15">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" dist="0" linePlacementFlags="18">
+            <DiagramLayerSettings dist="0" showAll="1" priority="0" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -8282,17 +8282,17 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="comment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="moveable" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="hidden" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" exp="" desc=""/>
@@ -8308,27 +8308,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
-              <field name="fence_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
-              <field name="cone_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
+              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
+              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column name="id" width="-1" hidden="0" type="field"/>
+                <column name="group" width="-1" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column name="comment" width="223" hidden="0" type="field"/>
+                <column name="moveable" width="-1" hidden="0" type="field"/>
+                <column name="type" width="-1" hidden="0" type="field"/>
+                <column name="name" width="414" hidden="0" type="field"/>
+                <column name="hidden" width="-1" hidden="0" type="field"/>
+                <column name="fence_len" width="-1" hidden="0" type="field"/>
+                <column name="cone_len" width="-1" hidden="0" type="field"/>
+                <column name="auxiliary_storage_labeling_positiony" width="-1" hidden="1" type="field"/>
+                <column name="auxiliary_storage_labeling_positionx" width="-1" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8373,18 +8373,18 @@ def my_form_open(dialog, layer, feature):
               <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8401,13 +8401,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -8416,7 +8416,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8424,7 +8424,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8465,7 +8465,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8473,7 +8473,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -8498,7 +8498,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8506,7 +8506,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -8539,19 +8539,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible"/>
-          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5" checkstate="0"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
+          <rule checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8559,7 +8559,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -8604,7 +8604,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8612,7 +8612,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -8657,7 +8657,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8665,7 +8665,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8710,7 +8710,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8718,7 +8718,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8763,7 +8763,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8771,7 +8771,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8810,7 +8810,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8818,7 +8818,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8863,12 +8863,12 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="comment" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Regular" textOpacity="0.80000000000000004" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="comment" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="255,255,255,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8876,7 +8876,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -8900,7 +8900,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8921,9 +8921,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="5" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="4294967295" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="5" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1.8200000000000001" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -8954,7 +8954,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -8968,14 +8968,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8983,7 +8983,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9014,7 +9014,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9022,7 +9022,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9046,7 +9046,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9056,9 +9056,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9094,7 +9094,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9108,14 +9108,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9123,7 +9123,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9154,7 +9154,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9162,7 +9162,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9186,7 +9186,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9196,9 +9196,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9234,7 +9234,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9250,12 +9250,12 @@ def my_form_open(dialog, layer, feature):
           </rule>
           <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9263,7 +9263,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9294,7 +9294,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9302,7 +9302,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9326,7 +9326,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9336,9 +9336,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9374,7 +9374,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9406,12 +9406,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9419,7 +9419,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -9461,7 +9461,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9474,73 +9474,73 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9549,28 +9549,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="comment" name="" index="2"/>
+        <alias field="moveable" name="" index="3"/>
+        <alias field="type" name="" index="4"/>
+        <alias field="name" name="" index="5"/>
+        <alias field="hidden" name="" index="6"/>
+        <alias field="day" name="" index="7"/>
+        <alias field="fence_len" name="" index="8"/>
+        <alias field="cone_len" name="" index="9"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="comment"/>
-        <policy policy="Duplicate" field="moveable"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="hidden"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="fence_len"/>
-        <policy policy="Duplicate" field="cone_len"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="comment" policy="Duplicate"/>
+        <policy field="moveable" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="hidden" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="fence_len" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -9585,16 +9585,16 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="comment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="moveable" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="hidden" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -9609,26 +9609,26 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="comment" width="373" type="field" hidden="0"/>
-          <column name="moveable" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="name" width="316" type="field" hidden="0"/>
-          <column name="hidden" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="comment" width="373" hidden="0" type="field"/>
+          <column name="moveable" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="name" width="316" hidden="0" type="field"/>
+          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column name="fence_len" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9704,9 +9704,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9780,13 +9780,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9795,7 +9795,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9803,7 +9803,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9844,7 +9844,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9852,7 +9852,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -9877,7 +9877,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9885,7 +9885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9918,9 +9918,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9928,7 +9928,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9985,12 +9985,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9998,7 +9998,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10040,7 +10040,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10053,10 +10053,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10065,16 +10065,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias field="id" name="" index="0"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
+        <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10085,8 +10085,8 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10127,9 +10127,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10203,13 +10203,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10218,7 +10218,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10226,7 +10226,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10267,7 +10267,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10275,7 +10275,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10300,7 +10300,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10308,7 +10308,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10341,9 +10341,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10351,7 +10351,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10403,12 +10403,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10416,7 +10416,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10458,7 +10458,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10477,10 +10477,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10490,7 +10490,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10500,7 +10500,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10510,7 +10510,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -10519,16 +10519,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="page"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="page" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -10537,10 +10537,10 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10554,11 +10554,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="page" width="-1" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="page" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10603,9 +10603,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10671,7 +10671,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10682,7 +10682,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" cascadedDelete="0" targetFieldName="position" joinFieldName="position" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" editable="1" upsertOnEdit="1" customPrefix="csv_">
+        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" hasCustomPrefix="1" dynamicForm="0" targetFieldName="position" joinFieldName="position" editable="1" cascadedDelete="0" upsertOnEdit="1" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10709,13 +10709,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="id" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="id">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10724,7 +10724,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10732,7 +10732,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10773,7 +10773,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10781,7 +10781,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10806,7 +10806,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10814,7 +10814,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10847,14 +10847,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" description="Show in marshal overview" label="Show by day in marshal plan" symbol="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan" symbol="1"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.8">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10862,7 +10862,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10893,7 +10893,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.8">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10901,7 +10901,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10932,7 +10932,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="0.01" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.01">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10940,7 +10940,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10975,14 +10975,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -10990,7 +10990,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11021,7 +11021,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11029,7 +11029,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11059,7 +11059,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11069,9 +11069,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11107,7 +11107,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11121,14 +11121,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11136,7 +11136,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11167,7 +11167,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11175,7 +11175,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11205,7 +11205,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11215,9 +11215,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11253,7 +11253,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11267,14 +11267,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.5" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.5" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11282,7 +11282,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11312,7 +11312,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11363,9 +11363,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11431,7 +11431,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11445,14 +11445,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.59999999999999998" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Regular" textOpacity="0.59999999999999998" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11460,7 +11460,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11491,7 +11491,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11499,7 +11499,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11529,7 +11529,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11539,9 +11539,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11607,7 +11607,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11621,14 +11621,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,0,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11636,7 +11636,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11667,7 +11667,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11675,7 +11675,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11705,7 +11705,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11715,9 +11715,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="10" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11783,7 +11783,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11956,12 +11956,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11969,7 +11969,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -12011,7 +12011,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12024,10 +12024,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12037,7 +12037,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12047,7 +12047,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12057,7 +12057,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12067,7 +12067,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="xyposition">
+        <field name="xyposition" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12077,28 +12077,28 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_day">
+        <field name="csv_day" configurationFlags="None">
           <editWidget type="CheckBox">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_position">
+        <field name="csv_position" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_club">
+        <field name="csv_club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12108,35 +12108,35 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_captain">
+        <field name="csv_captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_captain_phone">
+        <field name="csv_captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_race">
+        <field name="csv_race" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_last_runner">
+        <field name="csv_last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_instructions">
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12145,36 +12145,36 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_day" index="6" name=""/>
-        <alias field="csv_position" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captain" index="9" name=""/>
-        <alias field="csv_captain_phone" index="10" name=""/>
-        <alias field="csv_race" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="notes" name="" index="3"/>
+        <alias field="xyposition" name="" index="4"/>
+        <alias field="day" name="" index="5"/>
+        <alias field="csv_day" name="" index="6"/>
+        <alias field="csv_position" name="" index="7"/>
+        <alias field="csv_club" name="" index="8"/>
+        <alias field="csv_captain" name="" index="9"/>
+        <alias field="csv_captain_phone" name="" index="10"/>
+        <alias field="csv_race" name="" index="11"/>
+        <alias field="csv_last_runner" name="" index="12"/>
+        <alias field="csv_instructions" name="" index="13"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="notes"/>
-        <policy policy="Duplicate" field="xyposition"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="csv_day"/>
-        <policy policy="Duplicate" field="csv_position"/>
-        <policy policy="Duplicate" field="csv_club"/>
-        <policy policy="Duplicate" field="csv_captain"/>
-        <policy policy="Duplicate" field="csv_captain_phone"/>
-        <policy policy="Duplicate" field="csv_race"/>
-        <policy policy="Duplicate" field="csv_last_runner"/>
-        <policy policy="Duplicate" field="csv_instructions"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="notes" policy="Duplicate"/>
+        <policy field="xyposition" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="csv_day" policy="Duplicate"/>
+        <policy field="csv_position" policy="Duplicate"/>
+        <policy field="csv_club" policy="Duplicate"/>
+        <policy field="csv_captain" policy="Duplicate"/>
+        <policy field="csv_captain_phone" policy="Duplicate"/>
+        <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_last_runner" policy="Duplicate"/>
+        <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -12193,20 +12193,20 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_captain" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_race" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="notes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="xyposition" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_club" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain_phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_race" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_last_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_instructions" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -12230,21 +12230,21 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="notes" width="-1" type="field" hidden="0"/>
-          <column name="xyposition" width="151" type="field" hidden="0"/>
-          <column name="csv_day" width="-1" type="field" hidden="0"/>
-          <column name="csv_position" width="-1" type="field" hidden="0"/>
-          <column name="csv_club" width="-1" type="field" hidden="0"/>
-          <column name="csv_captain" width="-1" type="field" hidden="0"/>
-          <column name="csv_captain_phone" width="-1" type="field" hidden="0"/>
-          <column name="csv_race" width="-1" type="field" hidden="0"/>
-          <column name="csv_last_runner" width="-1" type="field" hidden="0"/>
-          <column name="csv_instructions" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="notes" width="-1" hidden="0" type="field"/>
+          <column name="xyposition" width="151" hidden="0" type="field"/>
+          <column name="csv_day" width="-1" hidden="0" type="field"/>
+          <column name="csv_position" width="-1" hidden="0" type="field"/>
+          <column name="csv_club" width="-1" hidden="0" type="field"/>
+          <column name="csv_captain" width="-1" hidden="0" type="field"/>
+          <column name="csv_captain_phone" width="-1" hidden="0" type="field"/>
+          <column name="csv_race" width="-1" hidden="0" type="field"/>
+          <column name="csv_last_runner" width="-1" hidden="0" type="field"/>
+          <column name="csv_instructions" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12449,9 +12449,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip>name</mapTip>
+      <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="vector" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="NoGeometry" minScale="1e+08">
+    <maplayer geometry="No geometry" wkbType="NoGeometry" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="vector" minScale="1e+08" readOnly="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12505,7 +12505,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12530,13 +12530,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12545,7 +12545,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12553,7 +12553,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12594,7 +12594,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12602,7 +12602,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -12627,7 +12627,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12635,7 +12635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -12685,17 +12685,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12705,21 +12705,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_name">
+        <field name="first_name" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12729,21 +12729,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12753,35 +12753,35 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="race">
+        <field name="race" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12790,34 +12790,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias field="day" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="first_name" name="" index="2"/>
+        <alias field="surname" name="" index="3"/>
+        <alias field="club" name="" index="4"/>
+        <alias field="phone" name="" index="5"/>
+        <alias field="email" name="" index="6"/>
+        <alias field="captain" name="" index="7"/>
+        <alias field="captain_phone" name="" index="8"/>
+        <alias field="race" name="" index="9"/>
+        <alias field="first_runner" name="" index="10"/>
+        <alias field="last_runner" name="" index="11"/>
+        <alias field="instructions" name="" index="12"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="first_name"/>
-        <policy policy="Duplicate" field="surname"/>
-        <policy policy="Duplicate" field="club"/>
-        <policy policy="Duplicate" field="phone"/>
-        <policy policy="Duplicate" field="email"/>
-        <policy policy="Duplicate" field="captain"/>
-        <policy policy="Duplicate" field="captain_phone"/>
-        <policy policy="Duplicate" field="race"/>
-        <policy policy="Duplicate" field="first_runner"/>
-        <policy policy="Duplicate" field="last_runner"/>
-        <policy policy="Duplicate" field="instructions"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="first_name" policy="Duplicate"/>
+        <policy field="surname" policy="Duplicate"/>
+        <policy field="club" policy="Duplicate"/>
+        <policy field="phone" policy="Duplicate"/>
+        <policy field="email" policy="Duplicate"/>
+        <policy field="captain" policy="Duplicate"/>
+        <policy field="captain_phone" policy="Duplicate"/>
+        <policy field="race" policy="Duplicate"/>
+        <policy field="first_runner" policy="Duplicate"/>
+        <policy field="last_runner" policy="Duplicate"/>
+        <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="day" expression="" applyOnUpdate="0"/>
@@ -12835,19 +12835,19 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="race" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="surname" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="club" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="email" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="race" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="instructions" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="day" exp="" desc=""/>
@@ -12870,20 +12870,20 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="club" width="-1" type="field" hidden="0"/>
-          <column name="phone" width="-1" type="field" hidden="0"/>
-          <column name="email" width="-1" type="field" hidden="0"/>
-          <column name="captain" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="first_runner" width="-1" type="field" hidden="0"/>
-          <column name="last_runner" width="-1" type="field" hidden="0"/>
-          <column name="instructions" width="-1" type="field" hidden="0"/>
-          <column name="surname" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="first_name" width="-1" type="field" hidden="0"/>
-          <column name="race" width="-1" type="field" hidden="0"/>
-          <column name="captain_phone" width="-1" type="field" hidden="0"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="club" width="-1" hidden="0" type="field"/>
+          <column name="phone" width="-1" hidden="0" type="field"/>
+          <column name="email" width="-1" hidden="0" type="field"/>
+          <column name="captain" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="first_runner" width="-1" hidden="0" type="field"/>
+          <column name="last_runner" width="-1" hidden="0" type="field"/>
+          <column name="instructions" width="-1" hidden="0" type="field"/>
+          <column name="surname" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="first_name" width="-1" hidden="0" type="field"/>
+          <column name="race" width="-1" hidden="0" type="field"/>
+          <column name="captain_phone" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12982,9 +12982,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13050,7 +13050,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13075,13 +13075,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13090,7 +13090,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13098,7 +13098,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13139,7 +13139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13147,7 +13147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13172,7 +13172,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13180,7 +13180,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13213,13 +13213,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13227,7 +13227,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13266,7 +13266,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13274,7 +13274,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -13312,7 +13312,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13338,7 +13338,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -13346,7 +13346,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -13368,7 +13368,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -13376,7 +13376,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -13419,12 +13419,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13432,7 +13432,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -13474,7 +13474,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13487,17 +13487,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13506,20 +13506,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -13531,9 +13531,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13576,9 +13576,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13644,7 +13644,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13669,13 +13669,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13684,7 +13684,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13692,7 +13692,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13733,7 +13733,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13741,7 +13741,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13766,7 +13766,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13774,7 +13774,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13807,15 +13807,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.75" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="8.5" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="8.5" namedStyle="Regular" textOpacity="0.75" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -13823,7 +13823,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -13847,7 +13847,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13878,9 +13878,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="1" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="2" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="1" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="0.20000000000000001" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -13921,7 +13921,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -13949,12 +13949,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13962,7 +13962,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14004,7 +14004,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14017,10 +14017,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14030,7 +14030,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14040,7 +14040,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14050,7 +14050,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14060,7 +14060,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14070,7 +14070,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14080,7 +14080,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14090,7 +14090,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14100,7 +14100,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14112,26 +14112,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="osm_id" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="type" name="" index="3"/>
+        <alias field="z_order" name="" index="4"/>
+        <alias field="population" name="" index="5"/>
+        <alias field="label_x" name="" index="6"/>
+        <alias field="label_y" name="" index="7"/>
+        <alias field="label_rota" name="" index="8"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="osm_id"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="z_order"/>
-        <policy policy="Duplicate" field="population"/>
-        <policy policy="Duplicate" field="label_x"/>
-        <policy policy="Duplicate" field="label_y"/>
-        <policy policy="Duplicate" field="label_rota"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="osm_id" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="z_order" policy="Duplicate"/>
+        <policy field="population" policy="Duplicate"/>
+        <policy field="label_x" policy="Duplicate"/>
+        <policy field="label_y" policy="Duplicate"/>
+        <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -14145,15 +14145,15 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="population" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14172,16 +14172,16 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column name="population" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="osm_id" width="-1" hidden="0" type="field"/>
+          <column name="name" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="z_order" width="-1" hidden="0" type="field"/>
+          <column name="population" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="label_x" width="-1" hidden="0" type="field"/>
+          <column name="label_y" width="-1" hidden="0" type="field"/>
+          <column name="label_rota" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14238,9 +14238,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14306,7 +14306,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14331,13 +14331,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14346,7 +14346,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14354,7 +14354,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -14395,7 +14395,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14403,7 +14403,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -14428,7 +14428,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14436,7 +14436,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14469,15 +14469,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="1" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="7" namedStyle="Regular" textOpacity="0.80000000000000004" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14485,7 +14485,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -14516,7 +14516,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14524,7 +14524,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -14548,7 +14548,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14558,9 +14558,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="3" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" placement="3" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="4" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="3" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="5" obstacleFactor="0.29999999999999999" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -14621,7 +14621,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -14659,12 +14659,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -14672,7 +14672,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14714,7 +14714,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14727,10 +14727,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14740,7 +14740,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14750,42 +14750,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14795,56 +14795,56 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -14853,40 +14853,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias field="osm_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="highway" name="" index="2"/>
+        <alias field="waterway" name="" index="3"/>
+        <alias field="aerialway" name="" index="4"/>
+        <alias field="barrier" name="" index="5"/>
+        <alias field="man_made" name="" index="6"/>
+        <alias field="z_order" name="" index="7"/>
+        <alias field="other_tags" name="" index="8"/>
+        <alias field="never_show" name="" index="9"/>
+        <alias field="label_x" name="" index="10"/>
+        <alias field="label_y" name="" index="11"/>
+        <alias field="label_rota" name="" index="12"/>
+        <alias field="always_sho" name="" index="13"/>
+        <alias field="resident_a" name="" index="14"/>
+        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="osm_id"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="highway"/>
-        <policy policy="Duplicate" field="waterway"/>
-        <policy policy="Duplicate" field="aerialway"/>
-        <policy policy="Duplicate" field="barrier"/>
-        <policy policy="Duplicate" field="man_made"/>
-        <policy policy="Duplicate" field="z_order"/>
-        <policy policy="Duplicate" field="other_tags"/>
-        <policy policy="Duplicate" field="never_show"/>
-        <policy policy="Duplicate" field="label_x"/>
-        <policy policy="Duplicate" field="label_y"/>
-        <policy policy="Duplicate" field="label_rota"/>
-        <policy policy="Duplicate" field="always_sho"/>
-        <policy policy="Duplicate" field="resident_a"/>
-        <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
+        <policy field="osm_id" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="highway" policy="Duplicate"/>
+        <policy field="waterway" policy="Duplicate"/>
+        <policy field="aerialway" policy="Duplicate"/>
+        <policy field="barrier" policy="Duplicate"/>
+        <policy field="man_made" policy="Duplicate"/>
+        <policy field="z_order" policy="Duplicate"/>
+        <policy field="other_tags" policy="Duplicate"/>
+        <policy field="never_show" policy="Duplicate"/>
+        <policy field="label_x" policy="Duplicate"/>
+        <policy field="label_y" policy="Duplicate"/>
+        <policy field="label_rota" policy="Duplicate"/>
+        <policy field="always_sho" policy="Duplicate"/>
+        <policy field="resident_a" policy="Duplicate"/>
+        <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="osm_id" expression="" applyOnUpdate="0"/>
@@ -14907,22 +14907,22 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="highway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="waterway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="aerialway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="other_tags" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="never_show" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="always_sho" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="resident_a" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="auxiliary_storage_labeling_show" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" exp="" desc=""/>
@@ -14948,23 +14948,23 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="160" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="highway" width="-1" type="field" hidden="0"/>
-          <column name="waterway" width="-1" type="field" hidden="0"/>
-          <column name="aerialway" width="-1" type="field" hidden="0"/>
-          <column name="barrier" width="-1" type="field" hidden="0"/>
-          <column name="man_made" width="-1" type="field" hidden="0"/>
-          <column name="other_tags" width="142" type="field" hidden="0"/>
-          <column name="never_show" width="-1" type="field" hidden="0"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
-          <column name="always_sho" width="-1" type="field" hidden="0"/>
-          <column name="resident_a" width="-1" type="field" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
+          <column name="osm_id" width="-1" hidden="0" type="field"/>
+          <column name="name" width="160" hidden="0" type="field"/>
+          <column name="z_order" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="highway" width="-1" hidden="0" type="field"/>
+          <column name="waterway" width="-1" hidden="0" type="field"/>
+          <column name="aerialway" width="-1" hidden="0" type="field"/>
+          <column name="barrier" width="-1" hidden="0" type="field"/>
+          <column name="man_made" width="-1" hidden="0" type="field"/>
+          <column name="other_tags" width="142" hidden="0" type="field"/>
+          <column name="never_show" width="-1" hidden="0" type="field"/>
+          <column name="label_x" width="-1" hidden="0" type="field"/>
+          <column name="label_y" width="-1" hidden="0" type="field"/>
+          <column name="label_rota" width="-1" hidden="0" type="field"/>
+          <column name="always_sho" width="-1" hidden="0" type="field"/>
+          <column name="resident_a" width="-1" hidden="0" type="field"/>
+          <column name="auxiliary_storage_labeling_show" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15131,9 +15131,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15199,7 +15199,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15224,13 +15224,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15239,7 +15239,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15247,7 +15247,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -15288,7 +15288,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15296,7 +15296,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -15321,7 +15321,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15329,7 +15329,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -15362,7 +15362,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
           <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
@@ -15372,7 +15372,7 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15380,7 +15380,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -15417,7 +15417,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15425,7 +15425,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,32,80,255" type="QString"/>
@@ -15461,7 +15461,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15469,7 +15469,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -15515,7 +15515,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15523,7 +15523,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -15559,7 +15559,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15567,7 +15567,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,12,254,255" type="QString"/>
@@ -15588,7 +15588,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="size_unit" value="MM" type="QString"/>
                 <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
                     <Option name="blend_mode" value="13" type="QString"/>
@@ -15689,7 +15689,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15697,7 +15697,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="43,153,41,255" type="QString"/>
@@ -15737,12 +15737,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="2" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeFillColor="255,255,255,255" shapeRadiiX="2" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15750,7 +15750,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -15774,7 +15774,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15800,9 +15800,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="3" xOffset="2" priority="10" yOffset="3" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="2" quadOffset="2" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="3" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="3" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="10" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -15838,7 +15838,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15866,12 +15866,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15879,7 +15879,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -15921,7 +15921,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15934,31 +15934,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15967,16 +15967,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="distance" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="distance"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -15985,10 +15985,10 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -16002,11 +16002,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="name" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16053,9 +16053,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16129,13 +16129,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16144,7 +16144,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16152,7 +16152,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16193,7 +16193,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16201,7 +16201,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16226,7 +16226,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16234,7 +16234,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16267,9 +16267,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16277,7 +16277,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" enabled="1" pass="0" class="LinePatternFill">
+            <layer class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="135" type="QString"/>
                 <Option name="clip_mode" value="during_render" type="QString"/>
@@ -16302,7 +16302,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -16310,7 +16310,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+                <layer class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="align_dash_pattern" value="0" type="QString"/>
                     <Option name="capstyle" value="square" type="QString"/>
@@ -16350,7 +16350,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16391,12 +16391,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -16404,7 +16404,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -16446,7 +16446,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16459,10 +16459,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16471,16 +16471,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias field="FID" name="" index="0"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="FID"/>
+        <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="FID" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" exp="" desc=""/>
@@ -16491,9 +16491,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="431" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="431" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16536,9 +16536,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16604,7 +16604,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16629,13 +16629,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16644,7 +16644,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16652,7 +16652,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16693,7 +16693,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16701,7 +16701,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16726,7 +16726,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16734,7 +16734,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16767,16 +16767,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
-          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16784,7 +16784,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16834,7 +16834,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16842,7 +16842,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16868,7 +16868,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -16876,7 +16876,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -16909,7 +16909,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16917,7 +16917,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16966,7 +16966,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16998,7 +16998,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17006,7 +17006,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -17045,7 +17045,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17053,7 +17053,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17102,7 +17102,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -17134,7 +17134,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17142,7 +17142,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -17181,7 +17181,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17189,7 +17189,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17243,12 +17243,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="times" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="Regular" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="times" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17256,7 +17256,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -17280,7 +17280,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17290,9 +17290,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="4294967295" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -17312,7 +17312,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -17340,12 +17340,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17353,7 +17353,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -17395,7 +17395,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17408,31 +17408,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17441,16 +17441,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="status" name="" index="2"/>
+        <alias field="times" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="status"/>
-        <policy policy="Duplicate" field="times"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="status" policy="Duplicate"/>
+        <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -17459,10 +17459,10 @@ def my_form_open(dialog, layer, feature):
         <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="status" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="times" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -17476,11 +17476,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="202" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="status" width="-1" type="field" hidden="0"/>
-          <column name="times" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="202" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="status" width="-1" hidden="0" type="field"/>
+          <column name="times" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17527,22 +17527,22 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37531611534391729</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
+        <ymin>-33.95600674067439684</ymin>
+        <xmax>18.42206713518007888</xmax>
         <ymax>-33.89975916640027265</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37531611534391729</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
+        <ymin>-33.95600674067439684</ymin>
+        <xmax>18.42206713518007888</xmax>
         <ymax>-33.89975916640027265</ymax>
       </wgs84extent>
-      <id>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</id>
+      <id>route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2</id>
       <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
       <keywordList>
         <value></value>
@@ -17603,13 +17603,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17618,7 +17618,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17626,7 +17626,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17667,7 +17667,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17675,7 +17675,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -17700,7 +17700,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17708,7 +17708,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17741,17 +17741,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17759,7 +17759,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -17790,7 +17790,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17798,7 +17798,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -17833,7 +17833,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17843,9 +17843,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17896,7 +17896,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -17910,14 +17910,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}" description="Show by day">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17925,7 +17925,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -17956,7 +17956,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17964,7 +17964,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -17999,7 +17999,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18009,9 +18009,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18062,7 +18062,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18076,15 +18076,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0">
-            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" description="List for legends" active="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="210,32,39,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18092,7 +18092,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18116,7 +18116,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18147,9 +18147,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18190,7 +18190,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18204,14 +18204,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="103,34,144,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18219,7 +18219,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18243,7 +18243,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18274,9 +18274,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18317,7 +18317,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18331,14 +18331,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="145,211,55,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18346,7 +18346,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18370,7 +18370,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18401,9 +18401,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18444,7 +18444,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18458,14 +18458,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0">
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" description="Trail" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="145,211,55,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18473,7 +18473,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                         <Option type="Map">
                           <Option name="angle" value="0" type="QString"/>
                           <Option name="cap_style" value="square" type="QString"/>
@@ -18504,7 +18504,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18512,7 +18512,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18536,7 +18536,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18546,9 +18546,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18589,7 +18589,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18622,12 +18622,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18635,7 +18635,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18677,7 +18677,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18690,10 +18690,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18703,7 +18703,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18713,7 +18713,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18723,7 +18723,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18733,7 +18733,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18743,7 +18743,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18753,7 +18753,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18763,7 +18763,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18773,21 +18773,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18797,7 +18797,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18807,7 +18807,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18817,7 +18817,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18827,7 +18827,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -18836,38 +18836,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="quadrant"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="Sort" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
+        <policy field="org_fid" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
+        <policy field="quadrant" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -18887,21 +18887,21 @@ def my_form_open(dialog, layer, feature):
         <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="quadrant" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -18926,22 +18926,22 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="quadrant" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="org_fid" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="begin" width="-1" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column name="Sort" width="-1" hidden="0" type="field"/>
+          <column name="quadrant" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19026,9 +19026,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
+      <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -19102,13 +19102,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19117,7 +19117,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19125,7 +19125,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19166,7 +19166,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19174,7 +19174,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19199,7 +19199,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19207,7 +19207,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19240,9 +19240,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19250,7 +19250,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19294,24 +19294,24 @@ def my_form_open(dialog, layer, feature):
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -19320,14 +19320,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="area" name="" index="1"/>
+        <alias field="rotation" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="area"/>
-        <policy policy="Duplicate" field="rotation"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="area" policy="Duplicate"/>
+        <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -19335,9 +19335,9 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="area" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="rotation" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -19350,10 +19350,10 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="area" width="-1" type="field" hidden="0"/>
-          <column name="rotation" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="area" width="-1" hidden="0" type="field"/>
+          <column name="rotation" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19374,9 +19374,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19390,7 +19390,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000' </datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19442,7 +19442,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19467,13 +19467,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19482,7 +19482,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19490,7 +19490,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19531,7 +19531,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19539,7 +19539,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19564,7 +19564,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19572,7 +19572,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19605,12 +19605,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="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" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19618,7 +19618,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}" pass="0" locked="1" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19683,12 +19683,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -19696,7 +19696,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -19738,7 +19738,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19751,31 +19751,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19785,14 +19785,14 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19802,7 +19802,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19812,42 +19812,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -19856,34 +19856,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="RouteLen" name="" index="5"/>
+        <alias field="Source" name="" index="6"/>
+        <alias field="length_m" name="" index="7"/>
+        <alias field="length_km" name="" index="8"/>
+        <alias field="org_fid" name="" index="9"/>
+        <alias field="distance" name="" index="10"/>
+        <alias field="first_runn" name="" index="11"/>
+        <alias field="last_runne" name="" index="12"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="first_runn"/>
-        <policy policy="Duplicate" field="last_runne"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="org_fid" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
+        <policy field="first_runn" policy="Duplicate"/>
+        <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -19901,19 +19901,19 @@ def my_form_open(dialog, layer, feature):
         <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runn" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runne" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -19936,20 +19936,20 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="begin" width="179" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="first_runn" width="-1" type="field" hidden="0"/>
-          <column name="last_runne" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="179" hidden="0" type="field"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column name="org_fid" width="-1" hidden="0" type="field"/>
+          <column name="first_runn" width="-1" hidden="0" type="field"/>
+          <column name="last_runne" width="-1" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20038,9 +20038,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20114,13 +20114,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20129,7 +20129,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20137,7 +20137,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20178,7 +20178,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20186,7 +20186,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20211,7 +20211,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20219,7 +20219,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20252,13 +20252,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20266,7 +20266,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20305,7 +20305,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20313,7 +20313,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -20351,7 +20351,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20377,7 +20377,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20385,7 +20385,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -20407,7 +20407,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -20415,7 +20415,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -20458,12 +20458,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20471,7 +20471,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20513,7 +20513,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20526,17 +20526,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20545,20 +20545,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -20570,9 +20570,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20615,9 +20615,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -20691,13 +20691,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20706,7 +20706,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20714,7 +20714,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20755,7 +20755,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20763,7 +20763,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20788,7 +20788,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20796,7 +20796,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20829,15 +20829,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="15" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="15" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="label" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20845,7 +20845,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -20869,7 +20869,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20879,9 +20879,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -20901,7 +20901,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -20928,12 +20928,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20941,7 +20941,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20983,7 +20983,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20996,17 +20996,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21015,20 +21015,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="label" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="label"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -21040,9 +21040,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="label" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21085,9 +21085,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21153,7 +21153,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21178,13 +21178,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21193,7 +21193,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21201,7 +21201,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21242,7 +21242,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21250,7 +21250,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -21275,7 +21275,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21283,7 +21283,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -21316,17 +21316,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="31,120,180,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" isExpression="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Bold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="75" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="label" textColor="31,120,180,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeRadiiX="0.5" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.29999999999999999" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeFillColor="255,255,255,204" shapeRadiiX="0.5" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -21334,7 +21334,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -21365,7 +21365,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -21373,7 +21373,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -21397,7 +21397,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21407,9 +21407,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="1" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PolygonGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="6" mergeLines="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="1" quadOffset="1" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="1" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="0.76000000000000001" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -21429,7 +21429,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -21465,12 +21465,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -21478,7 +21478,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -21520,7 +21520,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21539,10 +21539,10 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21552,7 +21552,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21562,7 +21562,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21572,14 +21572,14 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21588,18 +21588,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="table_set" name="" index="1"/>
+        <alias field="label" name="" index="2"/>
+        <alias field="races" name="" index="3"/>
+        <alias field="day" name="" index="4"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="table_set"/>
-        <policy policy="Duplicate" field="label"/>
-        <policy policy="Duplicate" field="races"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="table_set" policy="Duplicate"/>
+        <policy field="label" policy="Duplicate"/>
+        <policy field="races" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -21609,11 +21609,11 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="table_set" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -21628,12 +21628,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="table_set" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="races" width="130" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="table_set" width="-1" hidden="0" type="field"/>
+          <column name="label" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="races" width="130" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21688,7 +21688,7 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
   </projectlayers>
   <layerorder>
@@ -21717,7 +21717,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+    <layer id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -22056,349 +22056,350 @@ def my_form_open(dialog, layer, feature):
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" style="default"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" style="default"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Cones" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" 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 expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22428,11 +22429,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -22440,7 +22441,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -22463,9 +22464,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -22478,7 +22479,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22486,7 +22487,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -22512,9 +22513,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionOnPage="158.226,6.0007,mm" position="158.226,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" sectionY="0" frame="false" groupUuid="" excludeFromExports="0" hideBackgroundIfEmpty="0" size="132.391,187.018,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionX="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" itemRotation="0" hidePageIfEmpty="0" id="" visibility="1" positionLock="true" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="132.391,187.018,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" sectionHeight="184.8" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="158.226,6.0007,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionOnPage="158.226,6.0007,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22528,9 +22529,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="5" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="bevel" itemRotation="0" position="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" size="19.9422,32,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="128.508,3.98741,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="128.508,3.98741,mm" columnCount="1" visibility="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" size="19.9422,32,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.1,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="bevel" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="5" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+        <FrameColor red="128" green="128" alpha="255" blue="128"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22543,14 +22544,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22558,7 +22562,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22582,7 +22586,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22592,13 +22596,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.8805579999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="4.8805579999999997" fontSize="11" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22606,7 +22610,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22630,7 +22634,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22640,13 +22644,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.1750019999999992" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.1750019999999992" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22654,7 +22658,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22678,7 +22682,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22688,13 +22692,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22702,7 +22706,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22726,7 +22730,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22736,13 +22740,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="3.8222239999999998" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="3.8222239999999998" fontSize="8" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22750,7 +22754,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22774,7 +22778,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22793,7 +22797,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -22807,9 +22811,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="98.7828,149.027,mm" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="56.5192,54.5647,mm" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" isTemporal="0" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="56.5192,54.5647,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" id="Inset map" positionOnPage="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22822,11 +22826,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" ymin="-33.91622252962687867" xmax="18.42508615219792389"/>
+        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" xmax="18.42508615219792389" ymin="-33.91622252962687867"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22834,7 +22838,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -22875,7 +22879,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22883,7 +22887,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -22915,12 +22919,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22928,7 +22932,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -22952,7 +22956,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22974,8 +22978,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" position="3" centered="1" inverted="0" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22983,7 +22987,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23019,16 +23023,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65639" positionOnPage="3.53,6.0007,mm" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="142,187.018,mm" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" isTemporal="0" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="142,187.018,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" id="Main map" positionOnPage="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23041,11 +23045,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" ymin="-33.9148268542484459" xmax="18.42345344484109049"/>
+        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" xmax="18.42345344484109049" ymin="-33.9148268542484459"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23053,7 +23057,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23094,7 +23098,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23102,7 +23106,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -23134,12 +23138,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23147,7 +23151,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -23171,7 +23175,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23193,16 +23197,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="1" background="false" mode="1" type="65640" file="../GunRun2022_500.png" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="27.4317" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" blendMode="0" pictureHeight="27.6">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="27.6" northOffset="0" size="47.1065,27.6,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="27.4317" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_500.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="246.665,178.41,mm" id="" positionOnPage="246.665,178.41,mm" mode="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" anchorPoint="0" visibility="1" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23222,8 +23226,8 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" resizeMode="0" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" stylesheetEnabled="true">
-        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;">
+        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23266,13 +23270,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;id&quot;" filterFeatures="0" pageNameExpression="&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
+      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerProvider="ogr" sortKey="&quot;id&quot;" coverageLayerName="marshal_positions" enabled="1" pageNameExpression="&quot;position&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23280,7 +23284,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -23303,9 +23307,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -23318,7 +23322,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23326,7 +23330,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23352,9 +23356,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="0" type="65640" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="330" id="" visibility="1" positionLock="true" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" blendMode="0" pictureHeight="7.97477">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="7.97477" northOffset="0" size="9.45865,11,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="6.31767" frame="false" blendMode="0" background="false" opacity="1" file="arrows/NorthArrow_11.svg" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="330" outlineWidthM="0.3,mm" position="286.027,2,mm" id="" positionOnPage="286.027,2,mm" mode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" anchorPoint="0" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23374,9 +23378,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65641" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142.543,10.3185,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="[%upper( &quot;area&quot; )%]" opacity="1" referencePoint="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" frameJoinStyle="miter" itemRotation="270" htmlState="0" outlineWidthM="0.3,mm" position="285.027,205.886,mm" valign="64" id="" positionOnPage="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" halign="1" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23389,12 +23393,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23402,7 +23406,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -23426,7 +23430,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23436,9 +23440,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem minBarWidth="50" opacity="1" lineJoinStyle="miter" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" zValue="2" numSegments="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="3" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.3" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" frame="false" referencePoint="0" style="Single Box" unitType="meters" maxBarWidth="150" boxContentSpace="1" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="145.54,16.2165,mm" blendMode="0" labelBarSpace="3" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3" alignment="0" background="false" labelVerticalPlacement="0" numSegments="4" outlineWidth="0.3" minBarWidth="50" labelHorizontalPlacement="0" opacity="1" position="7,189.669,mm" type="65646" numUnitsPerSegment="100" itemRotation="0" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" subdivisionsHeight="1.5" boxContentSpace="1" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="26.3519" positionOnPage="7,189.669,mm" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" size="145.54,16.2165,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="3" style="Single Box" segmentSizeMode="1" lineJoinStyle="miter" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="150" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23451,12 +23455,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23464,7 +23468,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -23488,7 +23492,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23497,7 +23501,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -23509,10 +23513,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23520,7 +23524,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23561,7 +23565,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23569,7 +23573,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23610,7 +23614,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23618,7 +23622,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23659,7 +23663,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23667,7 +23671,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23692,7 +23696,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23700,7 +23704,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23725,9 +23729,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="7,5.5,mm" position="7,5.5,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="278.027,180.318,mm" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" isTemporal="0" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="278.027,180.318,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="330" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Start/Finish" outlineWidthM="0.3,mm" position="7,5.5,mm" id="" positionOnPage="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23756,11 +23760,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23768,7 +23772,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23809,7 +23813,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23817,7 +23821,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -23860,12 +23864,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23873,7 +23877,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -23897,7 +23901,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23919,12 +23923,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -23951,13 +23955,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="area" filterFeatures="0" pageNameExpression="&quot;area&quot;" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerProvider="ogr" sortKey="area" coverageLayerName="start_finish_area" enabled="1" pageNameExpression="&quot;area&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23965,7 +23969,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -23988,9 +23992,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -24003,7 +24007,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24011,7 +24015,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -24037,9 +24041,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" size="38.1563,67.2879,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="256.808,5.21277,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="0" legendFilterByAtlas="0" positionOnPage="256.808,5.21277,mm" columnCount="1" visibility="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" size="38.1563,67.2879,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="11" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24052,14 +24056,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24067,7 +24074,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24091,7 +24098,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24101,13 +24108,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24115,7 +24122,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24139,7 +24146,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24149,13 +24156,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24163,7 +24170,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24187,7 +24194,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24197,13 +24204,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24211,7 +24218,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24235,7 +24242,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24245,13 +24252,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24259,7 +24266,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24283,7 +24290,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24302,7 +24309,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -24318,7 +24325,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -24332,9 +24339,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,6.45211,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="FENCING: [% &quot;name&quot; %]" opacity="1" referencePoint="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" valign="32" id="" positionOnPage="6.76779,191.188,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" halign="1" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24347,12 +24354,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24360,7 +24367,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24384,7 +24391,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24394,9 +24401,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,6.45237,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" sectionWidth="56.3557" sectionHeight="5.76" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24409,12 +24416,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="26.8205,6.82826,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 3.0" opacity="1" referencePoint="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" valign="32" id="" positionOnPage="209.146,198.083,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24422,7 +24445,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24446,7 +24469,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24456,9 +24479,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.1638,7.07327,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" valign="32" id="" positionOnPage="62.6706,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24471,12 +24494,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24484,7 +24507,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24508,7 +24531,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24518,9 +24541,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="64.7594,7.10512,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" valign="32" id="" positionOnPage="116.805,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24533,12 +24556,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24546,7 +24569,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24570,7 +24593,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24580,9 +24603,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="52.7903,7.07327,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Page [% @atlas_featurenumber %]" opacity="1" referencePoint="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" valign="32" id="" positionOnPage="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" halign="1" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24595,12 +24618,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24608,7 +24631,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24632,7 +24655,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24642,71 +24665,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="52.7903,7.07327,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" blendMode="0" pictureHeight="29.8354">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="29.8354" northOffset="0" size="49.3143,29.8354,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.6535" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" id="" positionOnPage="243.098,175.353,mm" mode="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" anchorPoint="8" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24726,9 +24687,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" id="" positionOnPage="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24741,7 +24702,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24749,7 +24710,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -24773,9 +24734,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" zValue="2" numSegments="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="109.51,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2" alignment="0" background="false" labelVerticalPlacement="0" numSegments="2" outlineWidth="0.2" minBarWidth="25" labelHorizontalPlacement="0" opacity="1" position="6.76779,2.8482,mm" type="65646" numUnitsPerSegment="20" itemRotation="0" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" subdivisionsHeight="1.5" boxContentSpace="0.2" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="33.2496" positionOnPage="6.76779,2.8482,mm" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" size="109.51,15.8378,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="1" style="Double Box" segmentSizeMode="1" lineJoinStyle="round" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="100" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24788,12 +24749,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24801,7 +24762,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24825,7 +24786,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24834,7 +24795,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -24846,10 +24807,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24857,7 +24818,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24898,7 +24859,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24906,7 +24867,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24947,7 +24908,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24955,7 +24916,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24996,7 +24957,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25004,7 +24965,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25029,7 +24990,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25037,7 +24998,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25062,9 +25023,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" isTemporal="0" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="283.418,180.92,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="0.9" referencePoint="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Fencing" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" id="" positionOnPage="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25099,7 +25060,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
+        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" xmax="18.40522072458854552" ymin="-33.90817940102677852"/>
         <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>
@@ -25114,9 +25075,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25124,7 +25085,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25165,7 +25126,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25173,7 +25134,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -25216,12 +25177,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -25229,7 +25190,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -25253,7 +25214,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25275,13 +25236,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -25307,13 +25283,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="fence_and_cone_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerProvider="virtual" sortKey="&quot;group&quot;" coverageLayerName="fence_and_cone_groups" enabled="1" pageNameExpression="&quot;name&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0"/>
+      <Grid resolution="9" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25321,7 +25297,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -25344,9 +25320,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25359,7 +25335,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25367,7 +25343,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25392,12 +25368,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Directions to Start of Race" opacity="1" referencePoint="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" valign="64" id="" positionOnPage="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25410,12 +25386,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25423,7 +25399,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25447,7 +25423,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25457,9 +25433,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="48.2923,9.511,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Gun Run" opacity="1" referencePoint="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" valign="32" id="" positionOnPage="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25472,12 +25448,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25485,7 +25461,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25509,7 +25485,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25519,9 +25495,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="6" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" legendFilterByMap="1" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="round" itemRotation="0" position="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" frame="true" symbolHeight="5" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="0" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" size="59.0766,76,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="9" positionLock="false">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="0" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="10.096,10.8563,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="10.096,10.8563,mm" columnCount="1" visibility="1" legendFilterByMap="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" size="59.0766,76,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="9" equalColumnWidth="0" frameJoinStyle="round" groupUuid="" rasterBorderWidth="0" positionLock="false" zValue="6" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor red="139" green="139" alpha="255" blue="139"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25534,14 +25510,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="7.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="7.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25549,7 +25528,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25573,7 +25552,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25583,13 +25562,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25597,7 +25576,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25621,7 +25600,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25631,13 +25610,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25645,7 +25624,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25669,7 +25648,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25679,13 +25658,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25693,7 +25672,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25717,7 +25696,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25727,13 +25706,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="3" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="6.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25741,7 +25720,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25765,7 +25744,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25786,7 +25765,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="Start/Finish" type="QString"/>
@@ -25799,7 +25778,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
@@ -25813,9 +25792,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,6.871,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.0" opacity="1" referencePoint="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="221.862,190.027,mm" valign="32" id="" positionOnPage="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25828,12 +25807,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25841,7 +25820,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25865,7 +25844,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25875,9 +25854,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="197.975,197.498,mm" valign="64" id="" positionOnPage="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" halign="2" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25890,12 +25869,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25903,7 +25882,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25927,7 +25906,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25937,9 +25916,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" blendMode="0" pictureHeight="24.3824">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="24.3824" northOffset="0" size="42.9838,24.3824,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="24.2337" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="249.646,179.724,mm" id="" positionOnPage="249.646,179.724,mm" mode="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" anchorPoint="4" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25959,9 +25938,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="244.912,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" id="" positionOnPage="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25974,7 +25953,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25982,7 +25961,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26006,9 +25985,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="4.43449,6.411,mm" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="288.007,183.616,mm" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" isTemporal="0" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="288.007,183.616,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Ask Me" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" id="" positionOnPage="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26037,7 +26016,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" 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>
@@ -26052,9 +26031,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26062,7 +26041,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26103,7 +26082,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26111,7 +26090,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -26143,12 +26122,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26156,7 +26135,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -26180,7 +26159,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26202,12 +26181,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -26225,13 +26204,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="" coverageLayer="" enabled="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas coverageLayer="" enabled="0" pageNameExpression="" filterFeatures="0" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26239,7 +26218,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26262,9 +26241,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -26277,7 +26256,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26285,7 +26264,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -26310,12 +26289,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="13" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.8714,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 1.1" opacity="1" referencePoint="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="200.171,199.082,mm" valign="32" id="" positionOnPage="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" halign="2" visibility="1" zValue="13">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26328,12 +26307,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26341,7 +26320,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26365,7 +26344,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26375,9 +26354,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="12" background="false" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Gun Run 2023: [%&quot;Source&quot;%]" opacity="1" referencePoint="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" valign="64" id="" positionOnPage="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" halign="1" visibility="1" zValue="12">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26390,12 +26369,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26403,7 +26382,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26427,7 +26406,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26437,9 +26416,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="11" background="false" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" opacity="1" referencePoint="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" valign="32" id="" positionOnPage="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" halign="1" visibility="1" zValue="11">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26452,12 +26431,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26465,7 +26444,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26489,7 +26468,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26499,9 +26478,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="10" background="false" mode="1" type="65640" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" blendMode="0" pictureHeight="16.8993">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="16.8993" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.7523" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2023_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" anchorPoint="4" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26521,9 +26500,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65643" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.982,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" id="" positionOnPage="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26536,7 +26515,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26544,7 +26523,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26568,9 +26547,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="true" type="65639" positionOnPage="9.57644,5.42566,mm" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="107.861,186.385,mm" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="107.861,186.385,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="9.57644,5.42566,mm" id="Trail Finish" positionOnPage="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26589,18 +26568,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="true" type="65639" positionOnPage="112.643,4.09761,mm" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="179.156,189.279,mm" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="179.156,189.279,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="112.643,4.09761,mm" id="Trail Start" positionOnPage="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26619,18 +26598,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="67.7828,166.874,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" id="Left inset 21KM" positionOnPage="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26674,18 +26653,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="true" type="65639" positionOnPage="133.191,119.125,mm" position="133.191,119.125,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="113.3,76.1023,mm" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPreset="true" blendMode="0">
-        <FrameColor blue="144" green="34" red="103" alpha="255"/>
-        <BackgroundColor blue="215" green="175" red="200" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="113.3,76.1023,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="133.191,119.125,mm" id="Bottom inset 21KM" positionOnPage="133.191,119.125,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="5">
+        <FrameColor red="103" green="34" alpha="255" blue="144"/>
+        <BackgroundColor red="200" green="175" alpha="255" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26704,18 +26683,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="true" type="65639" positionOnPage="19.6693,7.89412,mm" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="68.3676,117.12,mm" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="68.3676,117.12,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="19.6693,7.89412,mm" id="End inset Trail" positionOnPage="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26734,18 +26713,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="170.062,49.6297,mm" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="63.655,88.3012,mm" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="63.655,88.3012,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="170.062,49.6297,mm" id="Start inset Trail" positionOnPage="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26764,18 +26743,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="200.321,125.314,mm" position="200.321,125.314,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="75.8756,69.7635,mm" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="75.8756,69.7635,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="200.321,125.314,mm" id="Contour inset Trail" positionOnPage="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26794,18 +26773,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.50144,5.50066,mm" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="282.372,186.105,mm" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.372,186.105,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="Routes" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" id="Main Map" positionOnPage="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26834,11 +26813,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975544251812778" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45388998618362919"/>
+        <Extent ymax="-33.89975544251812778" xmin="18.36400000000000077" xmax="18.45388998618362919" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26846,7 +26825,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26887,7 +26866,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26895,7 +26874,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -26927,12 +26906,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26940,7 +26919,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -26964,7 +26943,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26986,8 +26965,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" position="3" centered="0" inverted="0" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview centered="0" name="Overview 1" show="1" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27001,7 +26980,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27037,12 +27016,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -27059,7 +27038,7 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfDisableRasterTiles" value="0" type="int"/>
           <Option name="pdfExportThemes" value="" type="QString"/>
           <Option name="pdfIncludeMetadata" value="1" type="int"/>
-          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" type="QString"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" type="QString"/>
           <Option name="pdfLosslessImages" value="0" type="int"/>
           <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
           <Option name="pdfSimplify" value="1" type="int"/>
@@ -27067,13 +27046,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;Sort&quot;" filterFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerProvider="ogr" sortKey="&quot;Sort&quot;" coverageLayerName="all_routes" enabled="1" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27081,7 +27060,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27104,9 +27083,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="594,841,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27119,7 +27098,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27127,7 +27106,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27153,9 +27132,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="8" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" size="4,4,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="25.5925,18.7971,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="false" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="25.5925,18.7971,mm" columnCount="1" visibility="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" size="4,4,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="8" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27168,14 +27147,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27183,7 +27165,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27207,7 +27189,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27217,13 +27199,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27231,7 +27213,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27255,7 +27237,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27265,13 +27247,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27279,7 +27261,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27303,7 +27285,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27313,13 +27295,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27327,7 +27309,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27351,7 +27333,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27361,13 +27343,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27375,7 +27357,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27399,7 +27381,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27418,7 +27400,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes20170907054841602" expanded="1" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer name="all_routes" expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
@@ -27432,9 +27414,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="MARSHAL POSITIONS" opacity="1" referencePoint="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" valign="64" id="" positionOnPage="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27447,12 +27429,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27460,7 +27442,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27484,7 +27466,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27494,9 +27476,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.2" opacity="1" referencePoint="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="430.403,825.052,mm" valign="32" id="" positionOnPage="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27509,12 +27491,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27522,7 +27504,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27546,7 +27528,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27556,9 +27538,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="114.848,15.0635,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="372.175,808.942,mm" valign="64" id="" positionOnPage="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" halign="2" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27571,12 +27553,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27584,7 +27566,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27608,7 +27590,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27618,9 +27600,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" blendMode="0" pictureHeight="63.9757">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="63.9757" northOffset="0" size="100.498,63.9757,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="63.5856" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="489.557,775.395,mm" id="" positionOnPage="489.557,775.395,mm" mode="1" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" anchorPoint="8" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27640,9 +27622,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="481.428,0.606138,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" id="" positionOnPage="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27655,7 +27637,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27663,7 +27645,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27687,9 +27669,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="3.94474,5.25965,mm" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="584.759,811.213,mm" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="584.759,811.213,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal plan" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" id="" positionOnPage="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27718,14 +27700,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -27736,13 +27718,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerProvider="virtual" sortKey="page" coverageLayerName="complete_marshal_overview" enabled="1" pageNameExpression="&quot;page&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27750,7 +27732,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27773,9 +27755,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27788,7 +27770,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27796,7 +27778,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27821,12 +27803,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="15" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="244.484,130.172,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" groupUuid="" size="34.45,40.8,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="244.484,130.172,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="244.484,130.172,mm" columnCount="1" visibility="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" size="34.45,40.8,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="0" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="15">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27840,13 +27822,13 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27854,7 +27836,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27878,7 +27860,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27888,13 +27870,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27902,7 +27884,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27926,7 +27908,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27936,13 +27918,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27950,7 +27932,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27974,7 +27956,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27984,13 +27966,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27998,7 +27980,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -28022,7 +28004,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28032,13 +28014,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -28046,7 +28028,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -28070,7 +28052,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28089,7 +28071,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -28101,9 +28083,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="ACCESS ROUTES FOR RESIDENTS" opacity="1" referencePoint="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" valign="64" id="" positionOnPage="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28116,12 +28098,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28129,7 +28111,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28153,7 +28135,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28163,9 +28145,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.1" opacity="1" referencePoint="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" valign="64" id="" positionOnPage="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" halign="2" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28178,12 +28160,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28191,7 +28173,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28215,7 +28197,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28225,9 +28207,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" valign="64" id="" positionOnPage="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28240,12 +28222,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28253,7 +28235,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28277,7 +28259,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28287,9 +28269,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" blendMode="0" pictureHeight="17.4718">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="17.4718" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="17.3653" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" anchorPoint="4" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28309,9 +28291,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" id="" positionOnPage="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28324,7 +28306,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28332,7 +28314,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -28356,9 +28338,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="67.7828,166.874,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Access Routes" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" id="" positionOnPage="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28402,7 +28384,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" 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>
@@ -28417,9 +28399,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28427,7 +28409,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28468,7 +28450,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28476,7 +28458,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28508,12 +28490,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28521,7 +28503,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -28545,7 +28527,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28567,16 +28549,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,9.08557,mm" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,175.592,mm" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.012,175.592,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="Access Routes" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" id="" positionOnPage="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28605,7 +28587,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" 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>
@@ -28620,9 +28602,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28630,7 +28612,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28671,7 +28653,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28679,7 +28661,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28711,12 +28693,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28724,7 +28706,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -28748,7 +28730,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28770,12 +28752,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28793,13 +28775,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" coverageLayerName="residents_access" enabled="1" pageNameExpression="&quot;FID&quot;" filterFeatures="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28807,7 +28789,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -28830,9 +28812,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28845,7 +28827,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28853,7 +28835,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -28878,12 +28860,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Access to P9 Parking and VIP Tent" opacity="1" referencePoint="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" valign="64" id="" positionOnPage="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28896,12 +28878,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28909,7 +28891,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28933,7 +28915,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28943,9 +28925,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.0" opacity="1" referencePoint="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" valign="64" id="" positionOnPage="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" halign="2" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28958,12 +28940,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28971,7 +28953,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28995,7 +28977,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29005,9 +28987,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" valign="64" id="" positionOnPage="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29020,12 +29002,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29033,7 +29015,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29057,7 +29039,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29067,9 +29049,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" blendMode="0" pictureHeight="17.4718">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="17.4718" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="17.3653" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" anchorPoint="4" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29089,9 +29071,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" id="" positionOnPage="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29104,7 +29086,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29112,7 +29094,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -29136,9 +29118,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,7.25098,mm" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,182.649,mm" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" isTemporal="0" followPresetName="" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPreset="false" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.012,182.649,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" id="" positionOnPage="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" isTemporal="0" visibility="1" followPreset="false" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29167,7 +29149,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" 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>
@@ -29182,9 +29164,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29192,7 +29174,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -29233,7 +29215,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29241,7 +29223,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -29273,12 +29255,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -29286,7 +29268,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -29310,7 +29292,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29332,12 +29314,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29355,13 +29337,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" coverageLayerName="residents_access" enabled="0" pageNameExpression="&quot;FID&quot;" filterFeatures="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29369,7 +29351,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -29392,9 +29374,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,420,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29407,7 +29389,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29415,7 +29397,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -29441,9 +29423,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" itemRotation="0" id="" halign="4" visibility="1" positionLock="true" marginY="1" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" valign="32" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="23.5967,8.3142,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" sectionWidth="23.5967" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="112.086,406.476,mm" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionOnPage="112.086,406.476,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29456,12 +29438,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="27.7839,7.51682,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 5.0" opacity="1" referencePoint="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="214.292,406.874,mm" valign="32" id="" positionOnPage="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29469,7 +29467,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29493,7 +29491,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29503,71 +29501,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 5.0" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" size="21.6797,33,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="15.6525,12.5708,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="false" symbolHeight="4" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="15.6525,12.5708,mm" columnCount="1" visibility="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" size="21.6797,33,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="7" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29580,14 +29516,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29595,7 +29534,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29619,7 +29558,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29629,13 +29568,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29643,7 +29582,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29667,7 +29606,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29677,13 +29616,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29691,7 +29630,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29715,7 +29654,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29725,13 +29664,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29739,7 +29678,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29763,7 +29702,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29773,13 +29712,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29787,7 +29726,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29811,7 +29750,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29830,7 +29769,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29844,9 +29783,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="45.1194,8.13137,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="MARSHAL POSITIONS" opacity="1" referencePoint="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" valign="64" id="" positionOnPage="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29859,12 +29798,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29872,7 +29811,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29896,7 +29835,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29906,9 +29845,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" valign="32" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="118.192,7.80192,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" sectionWidth="118.192" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionOnPage="5.69321,406.988,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29921,56 +29860,10 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="93.5757,8.13167,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" sectionWidth="93.5757" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="148.501,398.344,mm" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionOnPage="148.501,398.344,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29983,56 +29876,10 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="31.1059" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" blendMode="0" pictureHeight="31.2967">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="31.2967" northOffset="0" size="49.3143,31.2967,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="31.1059" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.319,382.696,mm" id="" positionOnPage="243.319,382.696,mm" mode="1" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" anchorPoint="8" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30052,9 +29899,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="236.083,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" id="" positionOnPage="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30067,7 +29914,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30075,7 +29922,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30099,9 +29946,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="5.03,5.9483,mm" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="286.94,392.396,mm" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="286.94,392.396,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal plan" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" id="" positionOnPage="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30130,15 +29977,60 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" ymin="-33.91890002608484167" xmax="18.41474568521422484"/>
+        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" xmax="18.41474568521422484" ymin="-33.91890002608484167"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" html="Page [% &quot;page&quot; %] ">
+        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" html="&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>">
+        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" html="&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>">
+        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -30155,13 +30047,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerProvider="ogr" sortKey="page" coverageLayerName="marshal_overviews" enabled="1" pageNameExpression="&quot;page&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+    <Layout name="Fencing - Cones only" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30169,7 +30061,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30192,9 +30084,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -30207,7 +30099,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30215,7 +30107,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -30241,9 +30133,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" size="38.1563,53.7608,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="256.808,5.21277,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="0" legendFilterByAtlas="0" positionOnPage="256.808,5.21277,mm" columnCount="1" visibility="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" size="38.1563,53.7608,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="11" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30256,14 +30148,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30271,7 +30166,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30295,7 +30190,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30305,13 +30200,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30319,7 +30214,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30343,7 +30238,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30353,13 +30248,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30367,7 +30262,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30391,7 +30286,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30401,13 +30296,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30415,7 +30310,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30439,7 +30334,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30449,13 +30344,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30463,7 +30358,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30487,7 +30382,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30506,7 +30401,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -30522,7 +30417,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -30536,9 +30431,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="CONES: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,6.45211,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="CONES: [% &quot;name&quot; %]" opacity="1" referencePoint="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" valign="32" id="" positionOnPage="6.76779,191.188,mm" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" halign="1" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30551,12 +30446,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30564,7 +30459,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30588,7 +30483,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30598,9 +30493,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,6.45237,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" sectionWidth="56.3557" sectionHeight="5.76" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30613,12 +30508,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="26.8205,6.82826,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 3.0" opacity="1" referencePoint="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" valign="32" id="" positionOnPage="209.146,198.083,mm" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30626,7 +30537,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30650,7 +30561,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30660,9 +30571,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.1638,7.07327,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" valign="32" id="" positionOnPage="62.6706,198.083,mm" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" halign="1" visibility="0" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30675,12 +30586,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30688,7 +30599,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30712,7 +30623,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30722,9 +30633,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" itemRotation="0" id="" halign="1" visibility="0" positionLock="true" marginY="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="64.7594,7.10512,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" valign="32" id="" positionOnPage="116.805,198.083,mm" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30737,12 +30648,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30750,7 +30661,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30774,7 +30685,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30784,9 +30695,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="90.2083,7.07327,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Page [% @atlas_featurenumber %]" opacity="1" referencePoint="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" valign="32" id="" positionOnPage="6.76779,198.083,mm" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" halign="1" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30799,12 +30710,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30812,7 +30723,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30836,7 +30747,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30846,71 +30757,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="90.2083,7.07327,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northOffset="0" blendMode="0" pictureHeight="29.8354">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="29.8354" northOffset="0" size="49.3143,29.8354,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.6535" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" id="" positionOnPage="243.098,175.353,mm" mode="1" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" anchorPoint="8" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30930,9 +30779,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" id="" positionOnPage="6.91779,197.79,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30945,7 +30794,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30953,7 +30802,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30977,9 +30826,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" zValue="2" numSegments="2" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="88.3204,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" height="2" alignment="0" background="false" labelVerticalPlacement="0" numSegments="2" outlineWidth="0.2" minBarWidth="25" labelHorizontalPlacement="0" opacity="1" position="6.76779,2.8482,mm" type="65646" numUnitsPerSegment="30" itemRotation="0" frame="false" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" subdivisionsHeight="1.5" boxContentSpace="0.2" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="26.1864" positionOnPage="6.76779,2.8482,mm" visibility="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" size="88.3204,15.8378,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="1" style="Double Box" segmentSizeMode="1" lineJoinStyle="round" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="100" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30992,12 +30841,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31005,7 +30854,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -31029,7 +30878,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31038,7 +30887,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -31050,10 +30899,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31061,7 +30910,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31102,7 +30951,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31110,7 +30959,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31151,7 +31000,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31159,7 +31008,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31200,7 +31049,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31208,7 +31057,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -31233,7 +31082,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31241,7 +31090,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -31266,9 +31115,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" isTemporal="0" followPresetName="Cones" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="283.418,180.92,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="0.9" referencePoint="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Cones" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" id="" positionOnPage="6.76779,9.35102,mm" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31303,7 +31152,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
+        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" xmax="18.3837273348683965" ymin="-33.92052446432401069"/>
         <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>
@@ -31318,9 +31167,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31328,7 +31177,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -31369,7 +31218,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31377,7 +31226,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -31420,12 +31269,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -31433,7 +31282,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -31457,7 +31306,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31479,13 +31328,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -31511,14 +31375,15 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="cone_only_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerProvider="virtual" sortKey="&quot;group&quot;" coverageLayerName="cone_only_groups" enabled="1" pageNameExpression="&quot;name&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <Sensors/>
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.89871642408721897" xmin="18.39262360336048019" ymin="-33.91404092163588047" xmax="18.42086732654766834">
+    <DefaultViewExtent ymax="-33.94090179651766448" xmin="18.39827074155037323" xmax="18.42587305604926584" ymin="-33.9558782781264199">
       <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>
@@ -31532,10 +31397,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -31583,7 +31448,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" destinationFollowsActiveLayer="1" destinationLayer="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" autoAddTrackVertices="0" destinationLayerProvider="memory" destinationLayerName="route_markers" autoCommitFeatures="0">
+  <ProjectGpsSettings destinationFollowsActiveLayer="1" autoAddTrackVertices="0" destinationLayer="" autoCommitFeatures="0">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index 2805067..6b47de3 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 7da490e..9959efd 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveDateTime="2023-05-31T18:02:09" projectname="Gun Run" version="3.30.3-'s-Hertogenbosch" saveUserFull="Timothy Allen" saveUser="tim">
+<qgis saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run" version="3.32.0-Lima" saveDateTime="2023-07-08T16:33:21">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,16 +17,16 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer edl-is-active="1" edl-distance-unit="0" light-azimuth="315" combined-method="0" edl-strength="1000" edl-distance="0.5" hillshading-is-active="0" is-active="0" hillshading-z-factor="1" light-altitude="45" hillshading-is-multidirectional="0"/>
+  <elevation-shading-renderer is-active="0" edl-distance-unit="0" edl-distance="0.5" light-azimuth="315" edl-strength="1000" hillshading-is-multidirectional="0" edl-is-active="1" hillshading-z-factor="1" light-altitude="45" hillshading-is-active="0" combined-method="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="marshal_positions" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_positions [456]" type="QString"/>
@@ -37,7 +37,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="extra_security" id="extra_security20170921130834191" expanded="1" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="extra_security" expanded="1" source="./extra_security.shp" id="extra_security20170921130834191" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="extra_security" type="QString"/>
@@ -45,7 +45,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshals_by_position" id="marshals_by_position20161003112326575" expanded="1" legend_exp="" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="delimitedtext">
+      <layer-tree-layer name="marshals_by_position" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" checked="Qt::Unchecked" providerKey="delimitedtext" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshals_by_position [457]" type="QString"/>
@@ -53,14 +53,14 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="complete_marshal_overview" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="complete_marshal_overview" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="marshal_overviews" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_overviews" type="QString"/>
@@ -74,7 +74,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fencing" type="QString"/>
@@ -84,14 +84,14 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="cone_only_groups" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" expanded="1" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="cone_only_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="cone_only_groups" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="fence_and_cone_groups" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" expanded="1" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="virtual">
+      <layer-tree-layer name="fence_and_cone_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" checked="Qt::Unchecked" providerKey="virtual" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fence_and_cone_groups" type="QString"/>
@@ -107,7 +107,7 @@
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer name="route_markers" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" legend_exp="" patch_size="-1,-1" source="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" checked="Qt::Checked" legend_split_behavior="0" providerKey="memory">
+        <layer-tree-layer name="route_markers" expanded="1" source="Point?crs=EPSG:4326&amp;uid={88febb57-a4fc-4274-be6f-cad02f20fac0}" id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" checked="Qt::Checked" providerKey="memory" legend_split_behavior="0" legend_exp="" patch_size="-1,-1">
           <customproperties>
             <Option type="Map">
               <Option name="showFeatureCount" value="1" type="int"/>
@@ -115,7 +115,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="all_routes" type="QString"/>
@@ -125,7 +125,7 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_exp="" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+    <layer-tree-layer name="timelapse" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
       <customproperties>
         <Option type="Map">
           <Option name="cached_name" value="timelapse" type="QString"/>
@@ -136,7 +136,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="water_tables" id="water_tables20170921142016467" expanded="1" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="water_tables" expanded="1" source="./water_tables.shp" id="water_tables20170921142016467" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="water_tables" type="QString"/>
@@ -149,14 +149,14 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="directions_to_start" type="QString"/>
@@ -168,14 +168,14 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="mayor" expanded="1" source="./mayor.shp" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="viplabels" expanded="1" source="./viplabels.shp" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="viplabels" type="QString"/>
@@ -183,7 +183,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="vipaccess" expanded="1" source="./vipaccess.shp" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="vipaccess" type="QString"/>
@@ -191,12 +191,12 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="golfaccess" expanded="0" source="./golfaccess.shp" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="residents_access_roads" type="QString"/>
@@ -204,7 +204,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="residents_access" expanded="1" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
@@ -214,7 +214,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="osm_roads" expanded="0" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
@@ -223,7 +223,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="osm_places" expanded="1" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_places [7]" type="QString"/>
@@ -237,7 +237,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="data-comments" expanded="1" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="data-comments" type="QString"/>
@@ -245,7 +245,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="start_finish_area" expanded="1" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="start_finish_area" type="QString"/>
@@ -258,7 +258,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="ogr">
+      <layer-tree-layer name="capetownelevation-1m" expanded="1" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" checked="Qt::Unchecked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="showFeatureCount" value="1" type="QString"/>
@@ -270,7 +270,7 @@
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_split_behavior="0" providerKey="gdal">
+      <layer-tree-layer name="GDAL-City of Cape Town 2015 Aerial" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" checked="Qt::Unchecked" providerKey="gdal" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
@@ -278,7 +278,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_exp="" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_split_behavior="0" providerKey="wms">
+      <layer-tree-layer name="Outlines" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" checked="Qt::Checked" providerKey="wms" legend_split_behavior="0" legend_exp="" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="Outlines" type="QString"/>
@@ -313,35 +313,35 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</item>
+      <item>route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings tolerance="10" scaleDependencyMode="0" mode="3" self-snapping="1" maxScale="0" type="1" enabled="0" intersection-snapping="1" unit="1" minScale="0">
+  <snapping-settings intersection-snapping="1" maxScale="0" mode="3" self-snapping="1" scaleDependencyMode="0" tolerance="10" unit="1" enabled="0" type="1" minScale="0">
     <individual-layer-settings>
-      <layer-setting units="1" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="2" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" enabled="0" minScale="0"/>
-      <layer-setting units="2" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" maxScale="0" type="1" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" enabled="1" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" enabled="0" minScale="0"/>
-      <layer-setting units="1" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" enabled="0" minScale="0"/>
+      <layer-setting id="water_tables20170921142016467" units="2" maxScale="0" tolerance="0" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="extra_security20170921130834191" units="2" maxScale="0" tolerance="0" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" maxScale="0" tolerance="12" enabled="0" type="0" minScale="0"/>
+      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" maxScale="0" tolerance="12" enabled="0" type="0" minScale="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" units="1" maxScale="0" tolerance="12" enabled="0" type="1" minScale="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" maxScale="0" tolerance="20" enabled="1" type="2" minScale="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" maxScale="0" tolerance="12" enabled="0" type="2" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -349,10 +349,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39262360336048019</xmin>
-      <ymin>-33.91377785181562388</ymin>
-      <xmax>18.42086732654766834</xmax>
-      <ymax>-33.89897949390747556</ymax>
+      <xmin>18.40581914754706006</xmin>
+      <ymin>-33.9558782781264199</ymin>
+      <xmax>18.41832465005257902</xmax>
+      <ymax>-33.94090179651766448</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -373,166 +373,166 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="false" name="Marshals" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Marshals" checked="Qt::Unchecked" open="true">
+      <legendlayer name="marshal_positions" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="marshal_overviews" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="cone_only_groups" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="cone_only_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_and_cone_groups" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="route_markers" showFeatureCount="1" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer name="water_tables" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" checked="Qt::Checked" drawingOrder="-1" open="false" showFeatureCount="1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" checked="Qt::Unchecked" drawingOrder="-1" open="true" showFeatureCount="1">
+        <filegroup hidden="false" open="true">
           <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 drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked" drawingOrder="-1" open="false" showFeatureCount="0">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" checked="Qt::Checked" drawingOrder="-1" open="true" showFeatureCount="0">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="0">
+  <main-annotation-layer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="annotation" minScale="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -593,7 +593,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="raster" minScale="1e+08" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -648,7 +648,7 @@
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt></wkt>
-            <proj4></proj4>
+            <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0 +lon_0=0 +x_0=0 +y_0=0 +k=1 +units=m +nadgrids=@null +wktext +no_defs</proj4>
             <srsid>0</srsid>
             <srid>0</srid>
             <authid></authid>
@@ -659,7 +659,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -684,13 +684,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
+      <elevation zscale="1" zoffset="0" enabled="0" symbology="Line" band="1">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -699,7 +699,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -707,7 +707,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -748,7 +748,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -756,7 +756,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -792,7 +792,7 @@
           <Option name="identify/format" value="Value" type="QString"/>
         </Option>
       </customproperties>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
           <Option name="name" value="" type="QString"/>
@@ -802,9 +802,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" blueBand="3" redBand="1" greenBand="2" type="multibandcolor" nodataColor="">
+        <rasterrenderer opacity="0.5" greenBand="2" blueBand="3" nodataColor="" redBand="1" alphaBand="-1" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -815,14 +815,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation invertColors="0" colorizeOn="0" colorizeGreen="128" grayscaleMode="0" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" maxScale="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="raster" autoRefreshTime="0" refreshOnNotifyMessage="" minScale="1e+08">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="0" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="raster" minScale="1e+08" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -888,7 +888,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -911,13 +911,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" symbology="Line" enabled="0" zscale="1">
+      <elevation zscale="1" zoffset="0" enabled="0" symbology="Line" band="1">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -926,7 +926,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -934,7 +934,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -975,7 +975,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -983,7 +983,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1019,7 +1019,7 @@
           <Option name="identify/format" value="Undefined" type="QString"/>
         </Option>
       </customproperties>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
           <Option name="name" value="" type="QString"/>
@@ -1029,9 +1029,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer opacity="0.75" nodataColor="" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1042,14 +1042,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255" colorizeOn="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation invertColors="0" colorizeOn="0" colorizeGreen="128" grayscaleMode="0" colorizeBlue="128" colorizeStrength="100" saturation="0" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1115,7 +1115,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1129,8 +1129,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_km" expression="$length * 100" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="length_m" expression="$length * 100 * 1000" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1143,13 +1143,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="RouteLen" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="RouteLen">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -1158,7 +1158,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1166,7 +1166,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1207,7 +1207,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1215,7 +1215,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1240,7 +1240,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1248,7 +1248,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -1281,19 +1281,19 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Show by day">
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" checkstate="0"/>
-            <rule description="This should be disabled, since it's only for legends" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" checkstate="0"/>
+          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" label="Show by day" symbol="0">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="21KM" symbol="1"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" label="10KM" symbol="2"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends" label="5KM" symbol="3"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" label="Trail" symbol="4"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show" checkstate="0"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Always show by day" checkstate="0"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" symbol="5"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1301,7 +1301,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1338,7 +1338,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1346,7 +1346,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1368,7 +1368,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1376,7 +1376,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -1408,7 +1408,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1457,7 +1457,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1483,7 +1483,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1491,7 +1491,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1529,7 +1529,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1555,7 +1555,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1563,7 +1563,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1602,7 +1602,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1610,7 +1610,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1647,7 +1647,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1655,7 +1655,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1677,7 +1677,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1685,7 +1685,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -1717,7 +1717,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1766,7 +1766,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1792,7 +1792,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1800,7 +1800,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1838,7 +1838,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1864,7 +1864,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1872,7 +1872,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1911,7 +1911,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1919,7 +1919,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -1956,7 +1956,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1964,7 +1964,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -1986,7 +1986,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1994,7 +1994,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2026,7 +2026,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2075,7 +2075,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2101,7 +2101,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2109,7 +2109,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2147,7 +2147,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2173,7 +2173,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2181,7 +2181,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2220,7 +2220,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2228,7 +2228,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2265,7 +2265,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2273,7 +2273,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -2295,7 +2295,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@3@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2303,7 +2303,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2335,7 +2335,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2384,7 +2384,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2410,7 +2410,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2418,7 +2418,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2456,7 +2456,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2482,7 +2482,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2490,7 +2490,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2529,7 +2529,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2537,7 +2537,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2574,7 +2574,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2582,7 +2582,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -2604,7 +2604,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@4@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2612,7 +2612,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -2644,7 +2644,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2693,7 +2693,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2719,7 +2719,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2727,7 +2727,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" pass="0" locked="0" enabled="1">
                   <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 id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -2791,7 +2791,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2799,7 +2799,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2838,7 +2838,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2846,7 +2846,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2891,7 +2891,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="6" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="6" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2899,7 +2899,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2946,19 +2946,19 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{1e5906eb-3293-40e6-9693-aecca72e6ace}">
-          <rule description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{e8bc2eb1-ef27-4acd-94dc-f5f5984aa9dc}" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round($length / 1000, 0)" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round($length / 1000, 0)" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2966,7 +2966,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -2997,7 +2997,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3005,7 +3005,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -3040,7 +3040,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3050,9 +3050,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="1" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="1" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -3103,7 +3103,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -3117,14 +3117,14 @@
               </callout>
             </settings>
           </rule>
-          <rule description="Route lengths" key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" active="0">
+          <rule key="{42dd1aec-3e48-4dbd-b22f-b4960bd4f8d2}" description="Route lengths" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100, 4 )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100, 4 )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3132,7 +3132,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -3163,7 +3163,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3171,7 +3171,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -3206,7 +3206,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3216,9 +3216,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="km_marker()" overlapHandling="AllowOverlapAtNoCost" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="50" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapAtNoCost" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -3269,7 +3269,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -3308,12 +3308,12 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <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 id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -3363,7 +3363,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -3376,10 +3376,10 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3389,7 +3389,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3399,7 +3399,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3409,7 +3409,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3419,7 +3419,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3429,7 +3429,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3439,7 +3439,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3449,7 +3449,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3459,21 +3459,21 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3483,7 +3483,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3495,32 +3495,32 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="Sort" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -3537,18 +3537,18 @@
         <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -3565,27 +3565,27 @@
         <constraint field="length_m" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_km" expression="$length * 100" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="length_m" expression="$length * 100 * 1000" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="length_km" expression="$length * 100" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="length_m" expression="$length * 100 * 1000" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Name" width="152" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="163" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="188" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="266" type="field" hidden="0"/>
+          <column name="Name" width="152" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="begin" width="163" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="188" hidden="0" type="field"/>
+          <column name="Sort" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="266" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3661,9 +3661,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3737,13 +3737,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -3752,7 +3752,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3760,7 +3760,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3801,7 +3801,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3809,7 +3809,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -3834,7 +3834,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3842,7 +3842,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -3875,9 +3875,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3885,7 +3885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3942,24 +3942,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="ID">
+        <field name="ID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="height">
+        <field name="height" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="elevation">
+        <field name="elevation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -3968,14 +3968,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias field="ID" name="" index="0"/>
+        <alias field="height" name="" index="1"/>
+        <alias field="elevation" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="ID"/>
-        <policy policy="Duplicate" field="height"/>
-        <policy policy="Duplicate" field="elevation"/>
+        <policy field="ID" policy="Duplicate"/>
+        <policy field="height" policy="Duplicate"/>
+        <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="ID" expression="" applyOnUpdate="0"/>
@@ -3983,9 +3983,9 @@ def my_form_open(dialog, layer, feature):
         <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="ID" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="height" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="elevation" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" exp="" desc=""/>
@@ -4017,9 +4017,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression></previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4095,13 +4095,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4110,7 +4110,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4118,7 +4118,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4159,7 +4159,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4167,7 +4167,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4192,7 +4192,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4200,7 +4200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -4233,9 +4233,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4243,7 +4243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4286,31 +4286,31 @@ def my_form_open(dialog, layer, feature):
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -4319,16 +4319,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="page"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="page" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -4337,10 +4337,10 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -4373,9 +4373,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression></previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4451,13 +4451,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4466,7 +4466,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4474,7 +4474,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4515,7 +4515,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4523,7 +4523,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4548,7 +4548,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4556,7 +4556,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -4589,9 +4589,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4599,7 +4599,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -4639,12 +4639,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" enabled="0" showAxis="1" opacity="1" penWidth="0" penColor="#000000" direction="0" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="1" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="5" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -4652,7 +4652,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -4694,7 +4694,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4713,38 +4713,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4753,18 +4753,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
+        <alias field="cone_len" name="" index="4"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="name" expression="" applyOnUpdate="0"/>
@@ -4774,11 +4774,11 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -4793,12 +4793,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" width="306" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4853,9 +4853,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4921,7 +4921,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4946,13 +4946,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -4961,7 +4961,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4969,7 +4969,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5010,7 +5010,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5018,7 +5018,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5043,7 +5043,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5051,7 +5051,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -5084,9 +5084,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5094,7 +5094,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5139,12 +5139,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="Name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="Name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5152,7 +5152,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -5176,7 +5176,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5186,9 +5186,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="LineGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -5208,7 +5208,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -5236,12 +5236,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -5249,7 +5249,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -5291,7 +5291,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -5304,17 +5304,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -5323,20 +5323,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Name" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="Name"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5348,9 +5348,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5393,9 +5393,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>Name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5461,7 +5461,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5486,13 +5486,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -5501,7 +5501,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5509,7 +5509,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5550,7 +5550,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5558,7 +5558,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5583,7 +5583,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5591,7 +5591,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -5624,14 +5624,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM"/>
-          <rule description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" label="21KM" symbol="0"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" label="10KM" symbol="1"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5639,7 +5639,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5665,7 +5665,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5673,7 +5673,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5705,7 +5705,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5742,7 +5742,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5750,7 +5750,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -5772,7 +5772,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5780,7 +5780,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -5806,7 +5806,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -5845,7 +5845,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5853,7 +5853,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5890,7 +5890,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5898,7 +5898,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -5920,7 +5920,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5928,7 +5928,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -5954,7 +5954,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -5991,7 +5991,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5999,7 +5999,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -6021,7 +6021,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6029,7 +6029,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6055,7 +6055,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -6094,7 +6094,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6102,7 +6102,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6139,7 +6139,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6147,7 +6147,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -6169,7 +6169,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6177,7 +6177,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6203,7 +6203,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6240,7 +6240,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6248,7 +6248,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -6270,7 +6270,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6278,7 +6278,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6304,7 +6304,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -6345,7 +6345,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
@@ -6362,12 +6362,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6375,7 +6375,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -6417,7 +6417,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6430,17 +6430,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -6452,20 +6452,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="Distance" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="Distance"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -6477,9 +6477,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6540,9 +6540,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6616,13 +6616,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6631,7 +6631,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6639,7 +6639,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6680,7 +6680,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6688,7 +6688,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -6713,7 +6713,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6721,7 +6721,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6754,9 +6754,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.796078" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.796078">
             <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 id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6807,14 +6807,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="1">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6822,7 +6822,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -6852,7 +6852,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6888,9 +6888,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="1" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6941,7 +6941,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -6955,14 +6955,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="4" textOrientation="horizontal" fontKerning="1" textColor="227,0,185,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="4" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="227,0,185,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6970,7 +6970,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -7000,7 +7000,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -7021,9 +7021,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7059,7 +7059,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -7223,12 +7223,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7236,7 +7236,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7278,7 +7278,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="10" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="10" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7291,10 +7291,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7304,7 +7304,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7314,7 +7314,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7326,14 +7326,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -7341,9 +7341,9 @@ def my_form_open(dialog, layer, feature):
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -7356,10 +7356,10 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7433,9 +7433,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip>name</mapTip>
+      <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Polygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Polygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7501,7 +7501,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7530,13 +7530,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7545,7 +7545,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7553,7 +7553,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7594,7 +7594,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7602,7 +7602,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -7627,7 +7627,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7635,7 +7635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7668,9 +7668,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7678,7 +7678,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -7721,12 +7721,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7734,7 +7734,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7776,7 +7776,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7795,45 +7795,45 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7842,20 +7842,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias field="name" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
+        <alias field="cone_len" name="" index="4"/>
+        <alias field="fence_len" name="" index="5"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="cone_len"/>
-        <policy policy="Duplicate" field="fence_len"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
+        <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="name" expression="" applyOnUpdate="0"/>
@@ -7866,12 +7866,12 @@ def my_form_open(dialog, layer, feature):
         <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -7887,13 +7887,13 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="name" width="415" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column name="name" width="415" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="fence_len" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7951,9 +7951,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8019,7 +8019,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8033,42 +8033,42 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" minScale="1e+08">
+          <qgis labelsEnabled="1" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyDrawingHints="1" simplifyAlgorithm="0" readOnly="0" version="3.8.3-Zanzibar" minScale="1e+08" styleCategories="AllStyleCategories" simplifyDrawingTol="1" simplifyMaxScale="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" enableorderby="0" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" alpha="1" type="line" force_rhr="0">
-                  <layer locked="0" enabled="1" pass="0" class="SimpleLine">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
+                  <layer class="SimpleLine" pass="0" locked="0" enabled="1">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8084,15 +8084,15 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontSizeUnit="Point" textOpacity="0.8" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="comment" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0.6" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="1" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
-                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                    <text-style multilineHeight="1" fontSize="11" namedStyle="Regular" textOpacity="0.8" blendMode="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" fontItalic="0" fontLetterSpacing="0" fieldName="comment" textColor="0,0,0,255" previewBkgrdColor="#ffffff" fontCapitals="0" useSubstitutions="0" isExpression="0" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                      <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeType="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="1" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.6" shapeSizeX="1"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="2" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="5" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="4" geometryGeneratorEnabled="0" offsetType="0"/>
-                    <rendering displayAll="1" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                    <text-format plussign="0" multilineAlign="4294967295" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" preserveRotation="1" distUnits="MM" maxCurvedCharAngleIn="25" geometryGenerator="" offsetUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" centroidInside="0" repeatDistance="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" centroidWhole="0" xOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="5" rotationAngle="0" yOffset="0" geometryGeneratorEnabled="0" offsetType="0" fitInPolygonOnly="0" placement="4" priority="5" quadOffset="4"/>
+                    <rendering displayAll="1" labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8115,15 +8115,15 @@ def my_form_open(dialog, layer, feature):
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" fontCapitals="0" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="#ffffff" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-                      <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0"/>
-                      <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeOffsetY="0" shapeType="0" shapeBorderWidth="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiY="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeOffsetUnit="MM"/>
-                      <shadow shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowScale="100" shadowDraw="0" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                    <text-style multilineHeight="1" fontSize="12" namedStyle="Semibold" textOpacity="1" blendMode="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" fontItalic="0" fontLetterSpacing="0" fieldName="round( $length, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="#ffffff" fontCapitals="0" useSubstitutions="0" isExpression="1" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point" fontFamily="Myriad Pro">
+                      <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                      <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeType="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiY="0" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0"/>
+                      <shadow shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" plussign="0" addDirectionSymbol="0" decimals="3" wrapChar="" rightDirectionSymbol=">" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" preserveRotation="1" maxCurvedCharAngleOut="-25" rotationAngle="0" geometryGeneratorType="PointGeometry" geometryGenerator="" centroidWhole="0" maxCurvedCharAngleIn="25" placementFlags="15" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" priority="5" quadOffset="4" dist="1" repeatDistanceUnits="MM" yOffset="0" xOffset="0" centroidInside="0" placement="2" geometryGeneratorEnabled="0" offsetType="0"/>
-                    <rendering displayAll="0" fontMinPixelSize="3" scaleMax="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                    <text-format plussign="0" multilineAlign="4294967295" reverseDirectionSymbol="0" autoWrapLength="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement distMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" preserveRotation="1" distUnits="MM" maxCurvedCharAngleIn="25" geometryGenerator="" offsetUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" centroidInside="0" repeatDistance="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" centroidWhole="0" xOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="1" rotationAngle="0" yOffset="0" geometryGeneratorEnabled="0" offsetType="0" fitInPolygonOnly="0" placement="2" priority="5" quadOffset="4"/>
+                    <rendering displayAll="0" labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8155,13 +8155,13 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-              <DiagramCategory scaleDependency="Area" minScaleDenominator="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" enabled="0" opacity="1" penWidth="0" diagramOrientation="Up" penColor="#000000" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" width="15" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
+            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+              <DiagramCategory penWidth="0" penColor="#000000" scaleDependency="Area" backgroundAlpha="255" rotationOffset="270" labelPlacementMethod="XHeight" opacity="1" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" height="15" backgroundColor="#ffffff" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" width="15">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" dist="0" linePlacementFlags="18">
+            <DiagramLayerSettings dist="0" showAll="1" priority="0" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -8282,17 +8282,17 @@ def my_form_open(dialog, layer, feature):
               <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="comment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="moveable" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="hidden" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" exp="" desc=""/>
@@ -8308,27 +8308,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
-              <field name="fence_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
-              <field name="cone_len" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment="" typeName="double precision" subType="0" type="6" precision="0"/>
+              <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
+              <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
+              <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" subType="0" length="-1" comment="" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
               <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column name="id" width="-1" hidden="0" type="field"/>
+                <column name="group" width="-1" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column name="comment" width="223" hidden="0" type="field"/>
+                <column name="moveable" width="-1" hidden="0" type="field"/>
+                <column name="type" width="-1" hidden="0" type="field"/>
+                <column name="name" width="414" hidden="0" type="field"/>
+                <column name="hidden" width="-1" hidden="0" type="field"/>
+                <column name="fence_len" width="-1" hidden="0" type="field"/>
+                <column name="cone_len" width="-1" hidden="0" type="field"/>
+                <column name="auxiliary_storage_labeling_positiony" width="-1" hidden="1" type="field"/>
+                <column name="auxiliary_storage_labeling_positionx" width="-1" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8373,18 +8373,18 @@ def my_form_open(dialog, layer, feature):
               <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8401,13 +8401,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -8416,7 +8416,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8424,7 +8424,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8465,7 +8465,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8473,7 +8473,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -8498,7 +8498,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8506,7 +8506,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -8539,19 +8539,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="1" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible"/>
-          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5" checkstate="0"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
+          <rule checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8559,7 +8559,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -8604,7 +8604,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8612,7 +8612,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -8657,7 +8657,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8665,7 +8665,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8710,7 +8710,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8718,7 +8718,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8763,7 +8763,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8771,7 +8771,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8810,7 +8810,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8818,7 +8818,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8863,12 +8863,12 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="comment" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Regular" textOpacity="0.80000000000000004" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="comment" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="255,255,0,255" shapeBorderWidth="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="255,255,255,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.59999999999999998">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8876,7 +8876,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -8900,7 +8900,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8921,9 +8921,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="5" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="4294967295" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="5" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1.8200000000000001" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -8954,7 +8954,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -8968,14 +8968,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8983,7 +8983,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9014,7 +9014,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9022,7 +9022,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9046,7 +9046,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9056,9 +9056,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9094,7 +9094,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9108,14 +9108,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9123,7 +9123,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9154,7 +9154,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9162,7 +9162,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9186,7 +9186,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9196,9 +9196,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9234,7 +9234,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9250,12 +9250,12 @@ def my_form_open(dialog, layer, feature):
           </rule>
           <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9263,7 +9263,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -9294,7 +9294,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9302,7 +9302,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -9326,7 +9326,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9336,9 +9336,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="6" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="14" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="6" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9374,7 +9374,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -9406,12 +9406,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9419,7 +9419,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -9461,7 +9461,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9474,73 +9474,73 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="group">
+        <field name="group" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="comment">
+        <field name="comment" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="moveable">
+        <field name="moveable" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="hidden">
+        <field name="hidden" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -9549,28 +9549,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="group" name="" index="1"/>
+        <alias field="comment" name="" index="2"/>
+        <alias field="moveable" name="" index="3"/>
+        <alias field="type" name="" index="4"/>
+        <alias field="name" name="" index="5"/>
+        <alias field="hidden" name="" index="6"/>
+        <alias field="day" name="" index="7"/>
+        <alias field="fence_len" name="" index="8"/>
+        <alias field="cone_len" name="" index="9"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="group"/>
-        <policy policy="Duplicate" field="comment"/>
-        <policy policy="Duplicate" field="moveable"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="hidden"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="fence_len"/>
-        <policy policy="Duplicate" field="cone_len"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="group" policy="Duplicate"/>
+        <policy field="comment" policy="Duplicate"/>
+        <policy field="moveable" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="hidden" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="fence_len" policy="Duplicate"/>
+        <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -9585,16 +9585,16 @@ def my_form_open(dialog, layer, feature):
         <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="comment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="moveable" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="hidden" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -9609,26 +9609,26 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
-        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" comment="" typeName="double precision" subType="0" precision="0" type="6"/>
+        <field name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
+        <field name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" typeName="double precision" length="-1" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
         <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig sortExpression="&quot;name&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="comment" width="373" type="field" hidden="0"/>
-          <column name="moveable" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="name" width="316" type="field" hidden="0"/>
-          <column name="hidden" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="group" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="comment" width="373" hidden="0" type="field"/>
+          <column name="moveable" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="name" width="316" hidden="0" type="field"/>
+          <column name="hidden" width="-1" hidden="0" type="field"/>
+          <column name="fence_len" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="cone_len" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9704,9 +9704,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -9780,13 +9780,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9795,7 +9795,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9803,7 +9803,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9844,7 +9844,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9852,7 +9852,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -9877,7 +9877,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9885,7 +9885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9918,9 +9918,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9928,7 +9928,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9985,12 +9985,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9998,7 +9998,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10040,7 +10040,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10053,10 +10053,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10065,16 +10065,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias field="id" name="" index="0"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
+        <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10085,8 +10085,8 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10127,9 +10127,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10203,13 +10203,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10218,7 +10218,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10226,7 +10226,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10267,7 +10267,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10275,7 +10275,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10300,7 +10300,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10308,7 +10308,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10341,9 +10341,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10351,7 +10351,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10403,12 +10403,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10416,7 +10416,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10458,7 +10458,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10477,10 +10477,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10490,7 +10490,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10500,7 +10500,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -10510,7 +10510,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -10519,16 +10519,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="page" name="" index="2"/>
+        <alias field="day" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="page"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="page" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -10537,10 +10537,10 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10554,11 +10554,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="page" width="-1" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="page" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10603,9 +10603,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -10671,7 +10671,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -10682,7 +10682,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" cascadedDelete="0" targetFieldName="position" joinFieldName="position" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" editable="1" upsertOnEdit="1" customPrefix="csv_">
+        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" hasCustomPrefix="1" dynamicForm="0" targetFieldName="position" joinFieldName="position" editable="1" cascadedDelete="0" upsertOnEdit="1" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -10709,13 +10709,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="id" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="id">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10724,7 +10724,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10732,7 +10732,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10773,7 +10773,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10781,7 +10781,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -10806,7 +10806,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10814,7 +10814,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10847,14 +10847,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" description="Show in marshal overview" label="Show by day in marshal plan" symbol="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan" symbol="1"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.8">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10862,7 +10862,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10893,7 +10893,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="0.8" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.8">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10901,7 +10901,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10932,7 +10932,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="0.01" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="0.01">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10940,7 +10940,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" enabled="1" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" pass="1" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10975,14 +10975,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -10990,7 +10990,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11021,7 +11021,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11029,7 +11029,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11059,7 +11059,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11069,9 +11069,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11107,7 +11107,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11121,14 +11121,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.10000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="0.5">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11136,7 +11136,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11167,7 +11167,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11175,7 +11175,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11205,7 +11205,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11215,9 +11215,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="1" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="2" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="1" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="2" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11253,7 +11253,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11267,14 +11267,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.5" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" textOpacity="0.5" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.5">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11282,7 +11282,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11312,7 +11312,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11363,9 +11363,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11431,7 +11431,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11445,14 +11445,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.59999999999999998" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="6" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="6" namedStyle="Regular" textOpacity="0.59999999999999998" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11460,7 +11460,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11491,7 +11491,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11499,7 +11499,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11529,7 +11529,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11539,9 +11539,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="8" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="8" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11607,7 +11607,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11621,14 +11621,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="position" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="position" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeRadiiX="0" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.20000000000000001" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="0.40000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,0,255" shapeRadiiX="0" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11636,7 +11636,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -11667,7 +11667,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11675,7 +11675,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -11705,7 +11705,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -11715,9 +11715,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="0"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="0" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="10" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11783,7 +11783,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -11956,12 +11956,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11969,7 +11969,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -12011,7 +12011,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12024,10 +12024,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12037,7 +12037,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12047,7 +12047,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12057,7 +12057,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12067,7 +12067,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="xyposition">
+        <field name="xyposition" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12077,28 +12077,28 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_day">
+        <field name="csv_day" configurationFlags="None">
           <editWidget type="CheckBox">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_position">
+        <field name="csv_position" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_club">
+        <field name="csv_club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12108,35 +12108,35 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_captain">
+        <field name="csv_captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_captain_phone">
+        <field name="csv_captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_race">
+        <field name="csv_race" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_last_runner">
+        <field name="csv_last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="csv_instructions">
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12145,36 +12145,36 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_day" index="6" name=""/>
-        <alias field="csv_position" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captain" index="9" name=""/>
-        <alias field="csv_captain_phone" index="10" name=""/>
-        <alias field="csv_race" index="11" name=""/>
-        <alias field="csv_last_runner" index="12" name=""/>
-        <alias field="csv_instructions" index="13" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="type" name="" index="2"/>
+        <alias field="notes" name="" index="3"/>
+        <alias field="xyposition" name="" index="4"/>
+        <alias field="day" name="" index="5"/>
+        <alias field="csv_day" name="" index="6"/>
+        <alias field="csv_position" name="" index="7"/>
+        <alias field="csv_club" name="" index="8"/>
+        <alias field="csv_captain" name="" index="9"/>
+        <alias field="csv_captain_phone" name="" index="10"/>
+        <alias field="csv_race" name="" index="11"/>
+        <alias field="csv_last_runner" name="" index="12"/>
+        <alias field="csv_instructions" name="" index="13"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="notes"/>
-        <policy policy="Duplicate" field="xyposition"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="csv_day"/>
-        <policy policy="Duplicate" field="csv_position"/>
-        <policy policy="Duplicate" field="csv_club"/>
-        <policy policy="Duplicate" field="csv_captain"/>
-        <policy policy="Duplicate" field="csv_captain_phone"/>
-        <policy policy="Duplicate" field="csv_race"/>
-        <policy policy="Duplicate" field="csv_last_runner"/>
-        <policy policy="Duplicate" field="csv_instructions"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="notes" policy="Duplicate"/>
+        <policy field="xyposition" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="csv_day" policy="Duplicate"/>
+        <policy field="csv_position" policy="Duplicate"/>
+        <policy field="csv_club" policy="Duplicate"/>
+        <policy field="csv_captain" policy="Duplicate"/>
+        <policy field="csv_captain_phone" policy="Duplicate"/>
+        <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_last_runner" policy="Duplicate"/>
+        <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -12193,20 +12193,20 @@ def my_form_open(dialog, layer, feature):
         <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_captain" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_race" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="notes" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="xyposition" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_club" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain_phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_race" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_last_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_instructions" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -12230,21 +12230,21 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="notes" width="-1" type="field" hidden="0"/>
-          <column name="xyposition" width="151" type="field" hidden="0"/>
-          <column name="csv_day" width="-1" type="field" hidden="0"/>
-          <column name="csv_position" width="-1" type="field" hidden="0"/>
-          <column name="csv_club" width="-1" type="field" hidden="0"/>
-          <column name="csv_captain" width="-1" type="field" hidden="0"/>
-          <column name="csv_captain_phone" width="-1" type="field" hidden="0"/>
-          <column name="csv_race" width="-1" type="field" hidden="0"/>
-          <column name="csv_last_runner" width="-1" type="field" hidden="0"/>
-          <column name="csv_instructions" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="notes" width="-1" hidden="0" type="field"/>
+          <column name="xyposition" width="151" hidden="0" type="field"/>
+          <column name="csv_day" width="-1" hidden="0" type="field"/>
+          <column name="csv_position" width="-1" hidden="0" type="field"/>
+          <column name="csv_club" width="-1" hidden="0" type="field"/>
+          <column name="csv_captain" width="-1" hidden="0" type="field"/>
+          <column name="csv_captain_phone" width="-1" hidden="0" type="field"/>
+          <column name="csv_race" width="-1" hidden="0" type="field"/>
+          <column name="csv_last_runner" width="-1" hidden="0" type="field"/>
+          <column name="csv_instructions" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12449,9 +12449,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip>name</mapTip>
+      <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" styleCategories="AllStyleCategories" readOnly="0" maxScale="100000" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="vector" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="NoGeometry" minScale="1e+08">
+    <maplayer geometry="No geometry" wkbType="NoGeometry" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" maxScale="100000" refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="vector" minScale="1e+08" readOnly="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12505,7 +12505,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12530,13 +12530,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12545,7 +12545,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12553,7 +12553,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12594,7 +12594,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12602,7 +12602,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -12627,7 +12627,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12635,7 +12635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -12685,17 +12685,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12705,21 +12705,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_name">
+        <field name="first_name" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="surname">
+        <field name="surname" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="club">
+        <field name="club" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12729,21 +12729,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="phone">
+        <field name="phone" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="email">
+        <field name="email" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain">
+        <field name="captain" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12753,35 +12753,35 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="captain_phone">
+        <field name="captain_phone" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="race">
+        <field name="race" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runner">
+        <field name="first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runner">
+        <field name="last_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="instructions">
+        <field name="instructions" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12790,34 +12790,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="first_name" index="2" name=""/>
-        <alias field="surname" index="3" name=""/>
-        <alias field="club" index="4" name=""/>
-        <alias field="phone" index="5" name=""/>
-        <alias field="email" index="6" name=""/>
-        <alias field="captain" index="7" name=""/>
-        <alias field="captain_phone" index="8" name=""/>
-        <alias field="race" index="9" name=""/>
-        <alias field="first_runner" index="10" name=""/>
-        <alias field="last_runner" index="11" name=""/>
-        <alias field="instructions" index="12" name=""/>
+        <alias field="day" name="" index="0"/>
+        <alias field="position" name="" index="1"/>
+        <alias field="first_name" name="" index="2"/>
+        <alias field="surname" name="" index="3"/>
+        <alias field="club" name="" index="4"/>
+        <alias field="phone" name="" index="5"/>
+        <alias field="email" name="" index="6"/>
+        <alias field="captain" name="" index="7"/>
+        <alias field="captain_phone" name="" index="8"/>
+        <alias field="race" name="" index="9"/>
+        <alias field="first_runner" name="" index="10"/>
+        <alias field="last_runner" name="" index="11"/>
+        <alias field="instructions" name="" index="12"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="position"/>
-        <policy policy="Duplicate" field="first_name"/>
-        <policy policy="Duplicate" field="surname"/>
-        <policy policy="Duplicate" field="club"/>
-        <policy policy="Duplicate" field="phone"/>
-        <policy policy="Duplicate" field="email"/>
-        <policy policy="Duplicate" field="captain"/>
-        <policy policy="Duplicate" field="captain_phone"/>
-        <policy policy="Duplicate" field="race"/>
-        <policy policy="Duplicate" field="first_runner"/>
-        <policy policy="Duplicate" field="last_runner"/>
-        <policy policy="Duplicate" field="instructions"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="position" policy="Duplicate"/>
+        <policy field="first_name" policy="Duplicate"/>
+        <policy field="surname" policy="Duplicate"/>
+        <policy field="club" policy="Duplicate"/>
+        <policy field="phone" policy="Duplicate"/>
+        <policy field="email" policy="Duplicate"/>
+        <policy field="captain" policy="Duplicate"/>
+        <policy field="captain_phone" policy="Duplicate"/>
+        <policy field="race" policy="Duplicate"/>
+        <policy field="first_runner" policy="Duplicate"/>
+        <policy field="last_runner" policy="Duplicate"/>
+        <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="day" expression="" applyOnUpdate="0"/>
@@ -12835,19 +12835,19 @@ def my_form_open(dialog, layer, feature):
         <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="race" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="surname" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="club" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="email" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_phone" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="race" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runner" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="instructions" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="day" exp="" desc=""/>
@@ -12870,20 +12870,20 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="club" width="-1" type="field" hidden="0"/>
-          <column name="phone" width="-1" type="field" hidden="0"/>
-          <column name="email" width="-1" type="field" hidden="0"/>
-          <column name="captain" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="first_runner" width="-1" type="field" hidden="0"/>
-          <column name="last_runner" width="-1" type="field" hidden="0"/>
-          <column name="instructions" width="-1" type="field" hidden="0"/>
-          <column name="surname" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="first_name" width="-1" type="field" hidden="0"/>
-          <column name="race" width="-1" type="field" hidden="0"/>
-          <column name="captain_phone" width="-1" type="field" hidden="0"/>
+          <column name="position" width="-1" hidden="0" type="field"/>
+          <column name="club" width="-1" hidden="0" type="field"/>
+          <column name="phone" width="-1" hidden="0" type="field"/>
+          <column name="email" width="-1" hidden="0" type="field"/>
+          <column name="captain" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="first_runner" width="-1" hidden="0" type="field"/>
+          <column name="last_runner" width="-1" hidden="0" type="field"/>
+          <column name="instructions" width="-1" hidden="0" type="field"/>
+          <column name="surname" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="first_name" width="-1" hidden="0" type="field"/>
+          <column name="race" width="-1" hidden="0" type="field"/>
+          <column name="captain_phone" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12982,9 +12982,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13050,7 +13050,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13075,13 +13075,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13090,7 +13090,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13098,7 +13098,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13139,7 +13139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13147,7 +13147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13172,7 +13172,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13180,7 +13180,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13213,13 +13213,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13227,7 +13227,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13266,7 +13266,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13274,7 +13274,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -13312,7 +13312,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13338,7 +13338,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -13346,7 +13346,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -13368,7 +13368,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -13376,7 +13376,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -13419,12 +13419,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13432,7 +13432,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -13474,7 +13474,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13487,17 +13487,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13506,20 +13506,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -13531,9 +13531,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13576,9 +13576,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -13644,7 +13644,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13669,13 +13669,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13684,7 +13684,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13692,7 +13692,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13733,7 +13733,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13741,7 +13741,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -13766,7 +13766,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13774,7 +13774,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13807,15 +13807,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.75" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="8.5" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="8.5" namedStyle="Regular" textOpacity="0.75" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -13823,7 +13823,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -13847,7 +13847,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13878,9 +13878,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="1" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="2" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="1" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="0.20000000000000001" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -13921,7 +13921,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -13949,12 +13949,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13962,7 +13962,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14004,7 +14004,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14017,10 +14017,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14030,7 +14030,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14040,7 +14040,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14050,7 +14050,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14060,7 +14060,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14070,7 +14070,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14080,7 +14080,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14090,7 +14090,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14100,7 +14100,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14112,26 +14112,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="osm_id" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="type" name="" index="3"/>
+        <alias field="z_order" name="" index="4"/>
+        <alias field="population" name="" index="5"/>
+        <alias field="label_x" name="" index="6"/>
+        <alias field="label_y" name="" index="7"/>
+        <alias field="label_rota" name="" index="8"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="osm_id"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="z_order"/>
-        <policy policy="Duplicate" field="population"/>
-        <policy policy="Duplicate" field="label_x"/>
-        <policy policy="Duplicate" field="label_y"/>
-        <policy policy="Duplicate" field="label_rota"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="osm_id" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="z_order" policy="Duplicate"/>
+        <policy field="population" policy="Duplicate"/>
+        <policy field="label_x" policy="Duplicate"/>
+        <policy field="label_y" policy="Duplicate"/>
+        <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -14145,15 +14145,15 @@ def my_form_open(dialog, layer, feature):
         <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="population" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14172,16 +14172,16 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column name="population" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="osm_id" width="-1" hidden="0" type="field"/>
+          <column name="name" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column name="z_order" width="-1" hidden="0" type="field"/>
+          <column name="population" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="label_x" width="-1" hidden="0" type="field"/>
+          <column name="label_y" width="-1" hidden="0" type="field"/>
+          <column name="label_rota" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14238,9 +14238,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>name</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14306,7 +14306,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14331,13 +14331,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14346,7 +14346,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14354,7 +14354,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -14395,7 +14395,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14403,7 +14403,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -14428,7 +14428,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14436,7 +14436,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14469,15 +14469,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.80000000000000004" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="1" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="7" namedStyle="Regular" textOpacity="0.80000000000000004" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14485,7 +14485,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -14516,7 +14516,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14524,7 +14524,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -14548,7 +14548,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14558,9 +14558,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="3" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" placement="3" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="4" layerType="LineGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MapUnit" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="3" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="5" obstacleFactor="0.29999999999999999" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -14621,7 +14621,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -14659,12 +14659,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -14672,7 +14672,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14714,7 +14714,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14727,10 +14727,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14740,7 +14740,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14750,42 +14750,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="highway">
+        <field name="highway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="waterway">
+        <field name="waterway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="aerialway">
+        <field name="aerialway" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="barrier">
+        <field name="barrier" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="man_made">
+        <field name="man_made" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14795,56 +14795,56 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="other_tags">
+        <field name="other_tags" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="never_show">
+        <field name="never_show" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="always_sho">
+        <field name="always_sho" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="resident_a">
+        <field name="resident_a" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
+        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -14853,40 +14853,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias field="osm_id" name="" index="0"/>
+        <alias field="name" name="" index="1"/>
+        <alias field="highway" name="" index="2"/>
+        <alias field="waterway" name="" index="3"/>
+        <alias field="aerialway" name="" index="4"/>
+        <alias field="barrier" name="" index="5"/>
+        <alias field="man_made" name="" index="6"/>
+        <alias field="z_order" name="" index="7"/>
+        <alias field="other_tags" name="" index="8"/>
+        <alias field="never_show" name="" index="9"/>
+        <alias field="label_x" name="" index="10"/>
+        <alias field="label_y" name="" index="11"/>
+        <alias field="label_rota" name="" index="12"/>
+        <alias field="always_sho" name="" index="13"/>
+        <alias field="resident_a" name="" index="14"/>
+        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="osm_id"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="highway"/>
-        <policy policy="Duplicate" field="waterway"/>
-        <policy policy="Duplicate" field="aerialway"/>
-        <policy policy="Duplicate" field="barrier"/>
-        <policy policy="Duplicate" field="man_made"/>
-        <policy policy="Duplicate" field="z_order"/>
-        <policy policy="Duplicate" field="other_tags"/>
-        <policy policy="Duplicate" field="never_show"/>
-        <policy policy="Duplicate" field="label_x"/>
-        <policy policy="Duplicate" field="label_y"/>
-        <policy policy="Duplicate" field="label_rota"/>
-        <policy policy="Duplicate" field="always_sho"/>
-        <policy policy="Duplicate" field="resident_a"/>
-        <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
+        <policy field="osm_id" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="highway" policy="Duplicate"/>
+        <policy field="waterway" policy="Duplicate"/>
+        <policy field="aerialway" policy="Duplicate"/>
+        <policy field="barrier" policy="Duplicate"/>
+        <policy field="man_made" policy="Duplicate"/>
+        <policy field="z_order" policy="Duplicate"/>
+        <policy field="other_tags" policy="Duplicate"/>
+        <policy field="never_show" policy="Duplicate"/>
+        <policy field="label_x" policy="Duplicate"/>
+        <policy field="label_y" policy="Duplicate"/>
+        <policy field="label_rota" policy="Duplicate"/>
+        <policy field="always_sho" policy="Duplicate"/>
+        <policy field="resident_a" policy="Duplicate"/>
+        <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="osm_id" expression="" applyOnUpdate="0"/>
@@ -14907,22 +14907,22 @@ def my_form_open(dialog, layer, feature):
         <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="osm_id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="highway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="waterway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="aerialway" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="barrier" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="man_made" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="other_tags" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="never_show" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="always_sho" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="resident_a" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="auxiliary_storage_labeling_show" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" exp="" desc=""/>
@@ -14948,23 +14948,23 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="160" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="highway" width="-1" type="field" hidden="0"/>
-          <column name="waterway" width="-1" type="field" hidden="0"/>
-          <column name="aerialway" width="-1" type="field" hidden="0"/>
-          <column name="barrier" width="-1" type="field" hidden="0"/>
-          <column name="man_made" width="-1" type="field" hidden="0"/>
-          <column name="other_tags" width="142" type="field" hidden="0"/>
-          <column name="never_show" width="-1" type="field" hidden="0"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
-          <column name="always_sho" width="-1" type="field" hidden="0"/>
-          <column name="resident_a" width="-1" type="field" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
+          <column name="osm_id" width="-1" hidden="0" type="field"/>
+          <column name="name" width="160" hidden="0" type="field"/>
+          <column name="z_order" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="highway" width="-1" hidden="0" type="field"/>
+          <column name="waterway" width="-1" hidden="0" type="field"/>
+          <column name="aerialway" width="-1" hidden="0" type="field"/>
+          <column name="barrier" width="-1" hidden="0" type="field"/>
+          <column name="man_made" width="-1" hidden="0" type="field"/>
+          <column name="other_tags" width="142" hidden="0" type="field"/>
+          <column name="never_show" width="-1" hidden="0" type="field"/>
+          <column name="label_x" width="-1" hidden="0" type="field"/>
+          <column name="label_y" width="-1" hidden="0" type="field"/>
+          <column name="label_rota" width="-1" hidden="0" type="field"/>
+          <column name="always_sho" width="-1" hidden="0" type="field"/>
+          <column name="resident_a" width="-1" hidden="0" type="field"/>
+          <column name="auxiliary_storage_labeling_show" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15131,9 +15131,9 @@ def my_form_open(dialog, layer, feature):
         </widget>
       </widgets>
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15199,7 +15199,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15224,13 +15224,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15239,7 +15239,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15247,7 +15247,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -15288,7 +15288,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15296,7 +15296,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -15321,7 +15321,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15329,7 +15329,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -15362,7 +15362,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
           <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
@@ -15372,7 +15372,7 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15380,7 +15380,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -15417,7 +15417,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15425,7 +15425,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,32,80,255" type="QString"/>
@@ -15461,7 +15461,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15469,7 +15469,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -15515,7 +15515,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15523,7 +15523,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -15559,7 +15559,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15567,7 +15567,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,12,254,255" type="QString"/>
@@ -15588,7 +15588,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="size_unit" value="MM" type="QString"/>
                 <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
                     <Option name="blend_mode" value="13" type="QString"/>
@@ -15689,7 +15689,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15697,7 +15697,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" enabled="1" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="43,153,41,255" type="QString"/>
@@ -15737,12 +15737,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="name" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="name" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="2" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="2" shapeFillColor="255,255,255,255" shapeRadiiX="2" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="0.69999999999999996">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15750,7 +15750,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -15774,7 +15774,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -15800,9 +15800,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="3" xOffset="2" priority="10" yOffset="3" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="1" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="10" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1.8" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="2" quadOffset="2" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="3" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="3" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1.8" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="10" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -15838,7 +15838,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15866,12 +15866,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15879,7 +15879,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -15921,7 +15921,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15934,31 +15934,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15967,16 +15967,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="name" name="" index="2"/>
+        <alias field="distance" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="name"/>
-        <policy policy="Duplicate" field="distance"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="name" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -15985,10 +15985,10 @@ def my_form_open(dialog, layer, feature):
         <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -16002,11 +16002,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="name" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16053,9 +16053,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16129,13 +16129,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16144,7 +16144,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16152,7 +16152,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16193,7 +16193,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16201,7 +16201,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16226,7 +16226,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16234,7 +16234,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16267,9 +16267,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16277,7 +16277,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" enabled="1" pass="0" class="LinePatternFill">
+            <layer class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="135" type="QString"/>
                 <Option name="clip_mode" value="during_render" type="QString"/>
@@ -16302,7 +16302,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -16310,7 +16310,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+                <layer class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="align_dash_pattern" value="0" type="QString"/>
                     <Option name="capstyle" value="square" type="QString"/>
@@ -16350,7 +16350,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16391,12 +16391,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -16404,7 +16404,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -16446,7 +16446,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="1" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="1" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16459,10 +16459,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16471,16 +16471,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias field="FID" name="" index="0"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="FID"/>
+        <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="FID" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" exp="" desc=""/>
@@ -16491,9 +16491,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="431" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="431" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16536,9 +16536,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -16604,7 +16604,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16629,13 +16629,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16644,7 +16644,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16652,7 +16652,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16693,7 +16693,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16701,7 +16701,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16726,7 +16726,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16734,7 +16734,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16767,16 +16767,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
-          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16784,7 +16784,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16834,7 +16834,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16842,7 +16842,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16868,7 +16868,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -16876,7 +16876,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -16909,7 +16909,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16917,7 +16917,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16966,7 +16966,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -16998,7 +16998,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17006,7 +17006,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -17045,7 +17045,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17053,7 +17053,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17102,7 +17102,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -17134,7 +17134,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17142,7 +17142,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -17181,7 +17181,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17189,7 +17189,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17243,12 +17243,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="times" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" isExpression="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="Regular" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="times" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17256,7 +17256,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -17280,7 +17280,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17290,9 +17290,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="4294967295" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="2" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="4294967295" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -17312,7 +17312,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -17340,12 +17340,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17353,7 +17353,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -17395,7 +17395,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17408,31 +17408,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="status">
+        <field name="status" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="times">
+        <field name="times" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17441,16 +17441,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
+        <alias field="status" name="" index="2"/>
+        <alias field="times" name="" index="3"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
-        <policy policy="Duplicate" field="status"/>
-        <policy policy="Duplicate" field="times"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
+        <policy field="status" policy="Duplicate"/>
+        <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -17459,10 +17459,10 @@ def my_form_open(dialog, layer, feature):
         <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="status" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="times" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -17476,11 +17476,11 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="202" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="status" width="-1" type="field" hidden="0"/>
-          <column name="times" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="type" width="202" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="status" width="-1" hidden="0" type="field"/>
+          <column name="times" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17527,22 +17527,22 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="100000" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="100000" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37531611534391729</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
+        <ymin>-33.95600674067439684</ymin>
+        <xmax>18.42206713518007888</xmax>
         <ymax>-33.89975916640027265</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37531611534391729</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
+        <ymin>-33.95600674067439684</ymin>
+        <xmax>18.42206713518007888</xmax>
         <ymax>-33.89975916640027265</ymax>
       </wgs84extent>
-      <id>route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1</id>
+      <id>route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2</id>
       <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(5,0)</datasource>
       <keywordList>
         <value></value>
@@ -17603,13 +17603,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17618,7 +17618,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17626,7 +17626,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17667,7 +17667,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17675,7 +17675,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -17700,7 +17700,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17708,7 +17708,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17741,17 +17741,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17759,7 +17759,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -17790,7 +17790,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17798,7 +17798,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -17833,7 +17833,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17843,9 +17843,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17896,7 +17896,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -17910,14 +17910,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1a82228c-f408-4c3d-bb8d-158713c47604}" description="Show by day">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="0,0,0,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17925,7 +17925,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -17956,7 +17956,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17964,7 +17964,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -17999,7 +17999,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18009,9 +18009,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18062,7 +18062,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18076,15 +18076,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0">
-            <rule description="21KM" filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" description="List for legends" active="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="210,32,39,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="210,32,39,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18092,7 +18092,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18116,7 +18116,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18147,9 +18147,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="3" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18190,7 +18190,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18204,14 +18204,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="103,34,144,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="103,34,144,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18219,7 +18219,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18243,7 +18243,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18274,9 +18274,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18317,7 +18317,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18331,14 +18331,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{693188a6-ae99-4fd2-859f-1606793dda66}" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="128" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="145,211,55,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18346,7 +18346,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18370,7 +18370,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18401,9 +18401,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18444,7 +18444,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18458,14 +18458,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0">
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{ba58e108-c24a-410e-9584-a7819af049ef}" description="Trail" active="0">
               <settings calloutType="simple">
-                <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="255,255,255,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="1" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+                <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textColor="255,255,255,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                  <background shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="1" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                    <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="64" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="1"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                  <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidth="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="1" shapeFillColor="145,211,55,255" shapeRadiiX="1" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOpacity="1">
+                    <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18473,7 +18473,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                         <Option type="Map">
                           <Option name="angle" value="0" type="QString"/>
                           <Option name="cap_style" value="square" type="QString"/>
@@ -18504,7 +18504,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                    <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -18512,7 +18512,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                         <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"/>
@@ -18536,7 +18536,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -18546,9 +18546,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="0" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-                <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="2" xOffset="0" priority="10" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="20" allowDegraded="1" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="6" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-20" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PointGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="2" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+                <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="0" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+                <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="10" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="2" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="AllowOverlapIfRequired" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" lineAnchorType="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+                <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="2" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18589,7 +18589,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18622,12 +18622,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="100000" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="100000" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18635,7 +18635,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18677,7 +18677,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18690,10 +18690,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18703,7 +18703,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18713,7 +18713,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18723,7 +18723,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18733,7 +18733,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18743,7 +18743,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18753,7 +18753,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18763,7 +18763,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18773,21 +18773,21 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Sort">
+        <field name="Sort" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18797,7 +18797,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18807,7 +18807,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18817,7 +18817,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -18827,7 +18827,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="quadrant">
+        <field name="quadrant" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -18836,38 +18836,38 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="Distance" name="" index="5"/>
+        <alias field="RouteLen" name="" index="6"/>
+        <alias field="Source" name="" index="7"/>
+        <alias field="Sort" name="" index="8"/>
+        <alias field="day" name="" index="9"/>
+        <alias field="length_km" name="" index="10"/>
+        <alias field="length_m" name="" index="11"/>
+        <alias field="org_fid" name="" index="12"/>
+        <alias field="distance" name="" index="13"/>
+        <alias field="quadrant" name="" index="14"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="quadrant"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="Distance" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="Sort" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
+        <policy field="org_fid" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
+        <policy field="quadrant" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -18887,21 +18887,21 @@ def my_form_open(dialog, layer, feature):
         <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="quadrant" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -18926,22 +18926,22 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="quadrant" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="org_fid" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="begin" width="-1" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="Distance" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column name="Sort" width="-1" hidden="0" type="field"/>
+          <column name="quadrant" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19026,9 +19026,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
+      <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -19102,13 +19102,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19117,7 +19117,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19125,7 +19125,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19166,7 +19166,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19174,7 +19174,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19199,7 +19199,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19207,7 +19207,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19240,9 +19240,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="singleSymbol" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="singleSymbol" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19250,7 +19250,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19294,24 +19294,24 @@ def my_form_open(dialog, layer, feature):
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="area">
+        <field name="area" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="rotation">
+        <field name="rotation" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -19320,14 +19320,14 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="area" name="" index="1"/>
+        <alias field="rotation" name="" index="2"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="area"/>
-        <policy policy="Duplicate" field="rotation"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="area" policy="Duplicate"/>
+        <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -19335,9 +19335,9 @@ def my_form_open(dialog, layer, feature):
         <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="area" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="rotation" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -19350,10 +19350,10 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="area" width="-1" type="field" hidden="0"/>
-          <column name="rotation" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="area" width="-1" hidden="0" type="field"/>
+          <column name="rotation" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19374,9 +19374,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19390,7 +19390,7 @@ def my_form_open(dialog, layer, feature):
         <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000' </datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19442,7 +19442,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19467,13 +19467,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19482,7 +19482,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19490,7 +19490,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19531,7 +19531,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19539,7 +19539,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -19564,7 +19564,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19572,7 +19572,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19605,12 +19605,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="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" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19618,7 +19618,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}" pass="0" locked="1" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19683,12 +19683,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -19696,7 +19696,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -19738,7 +19738,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19751,31 +19751,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="descriptio">
+        <field name="descriptio" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="timestamp">
+        <field name="timestamp" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
+        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19785,14 +19785,14 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
+        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19802,7 +19802,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19812,42 +19812,42 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="first_runn">
+        <field name="first_runn" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="last_runne">
+        <field name="last_runne" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -19856,34 +19856,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias field="Name" name="" index="0"/>
+        <alias field="descriptio" name="" index="1"/>
+        <alias field="timestamp" name="" index="2"/>
+        <alias field="begin" name="" index="3"/>
+        <alias field="end" name="" index="4"/>
+        <alias field="RouteLen" name="" index="5"/>
+        <alias field="Source" name="" index="6"/>
+        <alias field="length_m" name="" index="7"/>
+        <alias field="length_km" name="" index="8"/>
+        <alias field="org_fid" name="" index="9"/>
+        <alias field="distance" name="" index="10"/>
+        <alias field="first_runn" name="" index="11"/>
+        <alias field="last_runne" name="" index="12"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="descriptio"/>
-        <policy policy="Duplicate" field="timestamp"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-        <policy policy="Duplicate" field="first_runn"/>
-        <policy policy="Duplicate" field="last_runne"/>
+        <policy field="Name" policy="Duplicate"/>
+        <policy field="descriptio" policy="Duplicate"/>
+        <policy field="timestamp" policy="Duplicate"/>
+        <policy field="begin" policy="Duplicate"/>
+        <policy field="end" policy="Duplicate"/>
+        <policy field="RouteLen" policy="Duplicate"/>
+        <policy field="Source" policy="Duplicate"/>
+        <policy field="length_m" policy="Duplicate"/>
+        <policy field="length_km" policy="Duplicate"/>
+        <policy field="org_fid" policy="Duplicate"/>
+        <policy field="distance" policy="Duplicate"/>
+        <policy field="first_runn" policy="Duplicate"/>
+        <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="Name" expression="" applyOnUpdate="0"/>
@@ -19901,19 +19901,19 @@ def my_form_open(dialog, layer, feature):
         <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runn" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runne" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -19936,20 +19936,20 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="begin" width="179" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="first_runn" width="-1" type="field" hidden="0"/>
-          <column name="last_runne" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column name="begin" width="179" hidden="0" type="field"/>
+          <column name="RouteLen" width="-1" hidden="0" type="field"/>
+          <column name="Source" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="Name" width="-1" hidden="0" type="field"/>
+          <column name="length_m" width="-1" hidden="0" type="field"/>
+          <column name="length_km" width="-1" hidden="0" type="field"/>
+          <column name="org_fid" width="-1" hidden="0" type="field"/>
+          <column name="first_runn" width="-1" hidden="0" type="field"/>
+          <column name="last_runne" width="-1" hidden="0" type="field"/>
+          <column name="descriptio" width="-1" hidden="0" type="field"/>
+          <column name="timestamp" width="-1" hidden="0" type="field"/>
+          <column name="end" width="-1" hidden="0" type="field"/>
+          <column name="distance" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20038,9 +20038,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Line" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="0" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiLineString" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiLineString" geometry="Line" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="0" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20114,13 +20114,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20129,7 +20129,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20137,7 +20137,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20178,7 +20178,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20186,7 +20186,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20211,7 +20211,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20219,7 +20219,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20252,13 +20252,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="RuleRenderer" forceraster="0">
+      <renderer-v2 forceraster="0" referencescale="-1" type="RuleRenderer" symbollevels="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20266,7 +20266,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20305,7 +20305,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20313,7 +20313,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -20351,7 +20351,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" enabled="1" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20377,7 +20377,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20385,7 +20385,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" enabled="1" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" pass="0" locked="0" enabled="1">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -20407,7 +20407,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -20415,7 +20415,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -20458,12 +20458,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20471,7 +20471,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20513,7 +20513,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="2" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="2" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20526,17 +20526,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20545,20 +20545,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="type" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="type"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -20570,9 +20570,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="type" width="-1" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20615,9 +20615,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Point" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="Point" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="Point" geometry="Point" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="0" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -20691,13 +20691,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20706,7 +20706,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20714,7 +20714,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20755,7 +20755,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20763,7 +20763,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -20788,7 +20788,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20796,7 +20796,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20829,15 +20829,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="15" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" isExpression="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="15" namedStyle="Semibold" textOpacity="1" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="label" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20845,7 +20845,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -20869,7 +20869,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20879,9 +20879,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="0" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" offsetUnits="MM" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="UnknownGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" unplacedVisibility="0" scaleVisibility="0" zIndex="0" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="0" upsidedownLabels="0" labelPerPart="0" maxNumLabels="2000" mergeLines="0" obstacleFactor="1" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+          <text-format plussign="0" autoWrapLength="0" multilineAlign="3" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+          <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="0" quadOffset="4" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="0" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MM" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+          <rendering labelPerPart="0" scaleMin="0" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="1" upsidedownLabels="0" scaleMax="0" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="0" fontMinPixelSize="3" unplacedVisibility="0"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -20901,7 +20901,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -20928,12 +20928,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" underline="0" style="0" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1" style="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20941,7 +20941,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20983,7 +20983,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="18" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="18" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20996,17 +20996,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21015,20 +21015,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="label" name="" index="1"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="label"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
         <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -21040,9 +21040,9 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column name="label" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21085,9 +21085,9 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>id</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer geometry="Polygon" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" simplifyLocal="1" simplifyDrawingTol="1" labelsEnabled="1" minScale="100000000" autoRefreshEnabled="0" legendPlaceholderImage="" readOnly="0" maxScale="0" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyAlgorithm="0">
+    <maplayer maxScale="0" simplifyLocal="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" wkbType="MultiPolygon" geometry="Polygon" autoRefreshEnabled="0" legendPlaceholderImage="" symbologyReferenceScale="-1" refreshOnNotifyEnabled="0" minScale="100000000" labelsEnabled="1" simplifyDrawingHints="1" refreshOnNotifyMessage="" autoRefreshTime="0" readOnly="0" simplifyAlgorithm="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21153,7 +21153,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" miny="0" maxx="0" minx="0" minz="0" maxy="0" maxz="0"/>
+          <spatial minx="0" maxy="0" maxz="0" dimensions="2" miny="0" minz="0" crs="" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21178,13 +21178,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" durationUnit="min" fixedDuration="0" startField="" durationField="" endField="" startExpression="" enabled="0" limitMode="0" endExpression="" accumulate="0">
+      <temporal endField="" startExpression="" startField="" limitMode="0" fixedDuration="0" mode="0" endExpression="" enabled="0" durationUnit="min" accumulate="0" durationField="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" binding="Centroid" zoffset="0" clamping="Terrain" symbology="Line" extrusionEnabled="0" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" zscale="1">
+      <elevation clamping="Terrain" respectLayerSymbol="1" binding="Centroid" zscale="1" zoffset="0" extrusion="0" extrusionEnabled="0" symbology="Line" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21193,7 +21193,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21201,7 +21201,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21242,7 +21242,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21250,7 +21250,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -21275,7 +21275,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21283,7 +21283,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -21316,17 +21316,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" enableorderby="0" symbollevels="0" type="nullSymbol" forceraster="0"/>
+      <renderer-v2 forceraster="0" referencescale="-1" type="nullSymbol" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style fontSizeUnit="Point" textOpacity="0.90000000000000002" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" legendString="Aa" fontUnderline="0" multilineHeightUnit="Percentage" fieldName="label" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="31,120,180,255" useSubstitutions="0" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" isExpression="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+              <text-style capitalization="0" multilineHeight="1" fontSize="8" namedStyle="Bold" textOpacity="0.90000000000000002" textOrientation="horizontal" blendMode="0" legendString="Aa" fontWeight="75" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" fieldName="label" textColor="31,120,180,255" previewBkgrdColor="255,255,255,255" useSubstitutions="0" forcedItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-                <background shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeRadiiX="0.5" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0.29999999999999999" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                  <symbol frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+                <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="31,120,206,255" shapeBorderWidth="0.75" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.29999999999999999" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0.5" shapeFillColor="255,255,255,204" shapeRadiiX="0.5" shapeDraw="1" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOpacity="0.59999999999999998">
+                  <symbol name="markerSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -21334,7 +21334,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" id="" pass="0" locked="0" enabled="1">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -21365,7 +21365,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -21373,7 +21373,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                       <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"/>
@@ -21397,7 +21397,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21407,9 +21407,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" plussign="0" decimals="3" wrapChar="" multilineAlign="1" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" autoWrapLength="0"/>
-              <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0" lineAnchorClipping="0" dist="0" xOffset="1" priority="5" yOffset="0" rotationUnit="AngleDegrees" lineAnchorTextPoint="CenterOfText" maxCurvedCharAngleIn="25" allowDegraded="0" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" offsetUnits="MapUnit" repeatDistanceUnits="MM" placement="0" preserveRotation="1" geometryGeneratorEnabled="0" polygonPlacementFlags="2" geometryGenerator="" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" lineAnchorType="0" distUnits="MM" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placementFlags="10" layerType="PolygonGeometry" offsetType="0" centroidInside="0" overrunDistance="0" lineAnchorPercent="0.5"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" unplacedVisibility="0" scaleVisibility="0" zIndex="5" fontMaxPixelSize="10000" fontLimitPixelSize="0" limitNumLabels="0" scaleMin="1" upsidedownLabels="0" labelPerPart="0" maxNumLabels="6" mergeLines="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" drawLabels="1" obstacleType="0" obstacle="1"/>
+              <text-format plussign="0" autoWrapLength="0" multilineAlign="1" reverseDirectionSymbol="0" decimals="3" wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" formatNumbers="0"/>
+              <placement rotationAngle="0" geometryGeneratorEnabled="0" overrunDistance="0" xOffset="1" quadOffset="1" allowDegraded="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" centroidWhole="1" geometryGeneratorType="PointGeometry" repeatDistanceUnits="MM" centroidInside="0" offsetType="0" distUnits="MM" offsetUnits="MapUnit" priority="5" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorClipping="0" dist="0" overrunDistanceUnit="MM" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" overlapHandling="PreventOverlap" rotationUnit="AngleDegrees" fitInPolygonOnly="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" lineAnchorType="0" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" yOffset="0" polygonPlacementFlags="2"/>
+              <rendering labelPerPart="0" scaleMin="1" limitNumLabels="0" fontLimitPixelSize="0" scaleVisibility="0" obstacle="1" minFeatureSize="0" obstacleFactor="0.76000000000000001" upsidedownLabels="0" scaleMax="10000000" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" obstacleType="0" zIndex="5" fontMinPixelSize="3" unplacedVisibility="0"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -21429,7 +21429,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 frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&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; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -21465,12 +21465,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-        <DiagramCategory minScaleDenominator="0" scaleDependency="Area" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" enabled="0" showAxis="0" opacity="1" penWidth="0" penColor="#000000" direction="1" diagramOrientation="Up" penAlpha="255" width="15" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" minimumSize="0" spacingUnit="MM" backgroundAlpha="255" backgroundColor="#ffffff" lineSizeType="MM" scaleBasedVisibility="0">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" underline="0" style="" bold="0" strikethrough="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+        <DiagramCategory penWidth="0" penColor="#000000" backgroundAlpha="255" scaleDependency="Area" spacingUnit="MM" rotationOffset="270" labelPlacementMethod="XHeight" direction="1" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" scaleBasedVisibility="0" diagramOrientation="Up" minScaleDenominator="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" minimumSize="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" sizeType="MM" lineSizeType="MM" spacing="0" width="15">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0" style=""/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -21478,7 +21478,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -21520,7 +21520,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" placement="0" zIndex="0" priority="0" obstacle="0" linePlacementFlags="2" dist="0">
+      <DiagramLayerSettings dist="0" priority="0" showAll="1" obstacle="0" linePlacementFlags="2" placement="0" zIndex="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21539,10 +21539,10 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21552,7 +21552,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21562,7 +21562,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21572,14 +21572,14 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="races">
+        <field name="races" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -21588,18 +21588,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias field="id" name="" index="0"/>
+        <alias field="table_set" name="" index="1"/>
+        <alias field="label" name="" index="2"/>
+        <alias field="races" name="" index="3"/>
+        <alias field="day" name="" index="4"/>
       </aliases>
       <splitPolicies>
-        <policy policy="Duplicate" field="id"/>
-        <policy policy="Duplicate" field="table_set"/>
-        <policy policy="Duplicate" field="label"/>
-        <policy policy="Duplicate" field="races"/>
-        <policy policy="Duplicate" field="day"/>
+        <policy field="id" policy="Duplicate"/>
+        <policy field="table_set" policy="Duplicate"/>
+        <policy field="label" policy="Duplicate"/>
+        <policy field="races" policy="Duplicate"/>
+        <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
         <default field="id" expression="" applyOnUpdate="0"/>
@@ -21609,11 +21609,11 @@ def my_form_open(dialog, layer, feature):
         <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
-        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint field="id" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="table_set" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="day" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -21628,12 +21628,12 @@ def my_form_open(dialog, layer, feature):
       </attributeactions>
       <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="table_set" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="races" width="130" type="field" hidden="0"/>
+          <column name="id" width="-1" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column name="table_set" width="-1" hidden="0" type="field"/>
+          <column name="label" width="-1" hidden="0" type="field"/>
+          <column name="day" width="-1" hidden="0" type="field"/>
+          <column name="races" width="130" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21688,7 +21688,7 @@ def my_form_open(dialog, layer, feature):
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
-      <mapTip></mapTip>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
   </projectlayers>
   <layerorder>
@@ -21717,7 +21717,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
+    <layer id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -21886,7 +21886,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes/20230708 - Gun Run 2023 - Routes 1.1.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -22056,349 +22056,350 @@ def my_form_open(dialog, layer, feature):
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0" style="default"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" style="default"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" style="default"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Cones" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - inset" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal map - main" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" 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 expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1"/>
-      <layer visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_a21a8adb_7557_44a6_b997_887cf33a01f2"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="0" id="water_tables20170921142016467" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" style="default"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" id="water_tables20170921142016467" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22428,11 +22429,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -22440,7 +22441,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -22463,9 +22464,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -22478,7 +22479,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22486,7 +22487,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -22512,9 +22513,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" sectionHeight="184.8" type="65647" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" positionOnPage="158.226,6.0007,mm" position="158.226,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" sectionY="0" frame="false" groupUuid="" excludeFromExports="0" hideBackgroundIfEmpty="0" size="132.391,187.018,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionX="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" itemRotation="0" hidePageIfEmpty="0" id="" visibility="1" positionLock="true" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="132.391,187.018,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" sectionWidth="132.391" sectionHeight="184.8" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="158.226,6.0007,mm" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionOnPage="158.226,6.0007,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22528,9 +22529,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="5" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="bevel" itemRotation="0" position="128.508,3.98741,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" size="19.9422,32,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="128.508,3.98741,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="128.508,3.98741,mm" columnCount="1" visibility="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" size="19.9422,32,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.1,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="bevel" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="5" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+        <FrameColor red="128" green="128" alpha="255" blue="128"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22543,14 +22544,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22558,7 +22562,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22582,7 +22586,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22592,13 +22596,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.8805579999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="11" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="4.8805579999999997" fontSize="11" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22606,7 +22610,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22630,7 +22634,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22640,13 +22644,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.1750019999999992" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.1750019999999992" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22654,7 +22658,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22678,7 +22682,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22688,13 +22692,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22702,7 +22706,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22726,7 +22730,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22736,13 +22740,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="3.8222239999999998" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="8" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="3.8222239999999998" fontSize="8" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -22750,7 +22754,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -22774,7 +22778,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22793,7 +22797,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -22807,9 +22811,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="98.7828,149.027,mm" position="98.7828,149.027,mm" outlineWidthM="0.2,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="56.5192,54.5647,mm" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" isTemporal="0" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="56.5192,54.5647,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" id="Inset map" positionOnPage="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -22822,11 +22826,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" ymin="-33.91622252962687867" xmax="18.42508615219792389"/>
+        <Extent ymax="-33.91207845085496331" xmin="18.42079363057069585" xmax="18.42508615219792389" ymin="-33.91622252962687867"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22834,7 +22838,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -22875,7 +22879,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22883,7 +22887,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -22915,12 +22919,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22928,7 +22932,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -22952,7 +22956,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22974,8 +22978,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" position="3" centered="1" inverted="0" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22983,7 +22987,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23019,16 +23023,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65639" positionOnPage="3.53,6.0007,mm" position="3.53,6.0007,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="142,187.018,mm" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" isTemporal="0" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="142,187.018,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" id="Main map" positionOnPage="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23041,11 +23045,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" ymin="-33.9148268542484459" xmax="18.42345344484109049"/>
+        <Extent ymax="-33.91347412623339608" xmin="18.42242633792752926" xmax="18.42345344484109049" ymin="-33.9148268542484459"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23053,7 +23057,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23094,7 +23098,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23102,7 +23106,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -23134,12 +23138,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23147,7 +23151,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -23171,7 +23175,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23193,16 +23197,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="1" background="false" mode="1" type="65640" file="../GunRun2022_500.png" positionOnPage="246.665,178.41,mm" position="246.665,178.41,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="27.4317" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" blendMode="0" pictureHeight="27.6">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="27.6" northOffset="0" size="47.1065,27.6,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="27.4317" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_500.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="246.665,178.41,mm" id="" positionOnPage="246.665,178.41,mm" mode="1" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" anchorPoint="0" visibility="1" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23222,8 +23226,8 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" resizeMode="0" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" stylesheetEnabled="true">
-        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;">
+        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23266,13 +23270,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;id&quot;" filterFeatures="0" pageNameExpression="&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="1" hideCoverage="0" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1"/>
+      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerProvider="ogr" sortKey="&quot;id&quot;" coverageLayerName="marshal_positions" enabled="1" pageNameExpression="&quot;position&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23280,7 +23284,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -23303,9 +23307,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -23318,7 +23322,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23326,7 +23330,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23352,9 +23356,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="0" type="65640" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" position="286.027,2,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" frame="false" groupUuid="" excludeFromExports="0" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="330" id="" visibility="1" positionLock="true" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" blendMode="0" pictureHeight="7.97477">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="7.97477" northOffset="0" size="9.45865,11,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="6.31767" frame="false" blendMode="0" background="false" opacity="1" file="arrows/NorthArrow_11.svg" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="330" outlineWidthM="0.3,mm" position="286.027,2,mm" id="" positionOnPage="286.027,2,mm" mode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" anchorPoint="0" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23374,9 +23378,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65641" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" position="285.027,205.886,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" itemRotation="270" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="142.543,10.3185,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="[%upper( &quot;area&quot; )%]" opacity="1" referencePoint="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" frameJoinStyle="miter" itemRotation="270" htmlState="0" outlineWidthM="0.3,mm" position="285.027,205.886,mm" valign="64" id="" positionOnPage="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" halign="1" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23389,12 +23393,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23402,7 +23406,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -23426,7 +23430,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23436,9 +23440,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem minBarWidth="50" opacity="1" lineJoinStyle="miter" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.3519" numUnitsPerSegment="100" zValue="2" numSegments="4" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="3" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.3" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" frame="false" referencePoint="0" style="Single Box" unitType="meters" maxBarWidth="150" boxContentSpace="1" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="145.54,16.2165,mm" blendMode="0" labelBarSpace="3" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3" alignment="0" background="false" labelVerticalPlacement="0" numSegments="4" outlineWidth="0.3" minBarWidth="50" labelHorizontalPlacement="0" opacity="1" position="7,189.669,mm" type="65646" numUnitsPerSegment="100" itemRotation="0" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" subdivisionsHeight="1.5" boxContentSpace="1" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="26.3519" positionOnPage="7,189.669,mm" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" size="145.54,16.2165,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="3" style="Single Box" segmentSizeMode="1" lineJoinStyle="miter" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="150" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23451,12 +23455,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23464,7 +23468,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -23488,7 +23492,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23497,7 +23501,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -23509,10 +23513,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23520,7 +23524,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23561,7 +23565,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23569,7 +23573,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23610,7 +23614,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23618,7 +23622,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -23659,7 +23663,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23667,7 +23671,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23692,7 +23696,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23700,7 +23704,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -23725,9 +23729,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="7,5.5,mm" position="7,5.5,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="278.027,180.318,mm" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" isTemporal="0" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="278.027,180.318,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="330" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Start/Finish" outlineWidthM="0.3,mm" position="7,5.5,mm" id="" positionOnPage="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -23756,11 +23760,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23768,7 +23772,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23809,7 +23813,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23817,7 +23821,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -23860,12 +23864,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23873,7 +23877,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -23897,7 +23901,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -23919,12 +23923,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -23951,13 +23955,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="area" filterFeatures="0" pageNameExpression="&quot;area&quot;" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerProvider="ogr" sortKey="area" coverageLayerName="start_finish_area" enabled="1" pageNameExpression="&quot;area&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -23965,7 +23969,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -23988,9 +23992,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -24003,7 +24007,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24011,7 +24015,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -24037,9 +24041,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" size="38.1563,67.2879,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="256.808,5.21277,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="0" legendFilterByAtlas="0" positionOnPage="256.808,5.21277,mm" columnCount="1" visibility="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" size="38.1563,67.2879,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="11" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24052,14 +24056,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24067,7 +24074,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24091,7 +24098,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24101,13 +24108,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24115,7 +24122,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24139,7 +24146,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24149,13 +24156,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24163,7 +24170,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24187,7 +24194,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24197,13 +24204,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24211,7 +24218,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24235,7 +24242,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24245,13 +24252,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -24259,7 +24266,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -24283,7 +24290,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24302,7 +24309,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -24318,7 +24325,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -24332,9 +24339,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,6.45211,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="FENCING: [% &quot;name&quot; %]" opacity="1" referencePoint="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" valign="32" id="" positionOnPage="6.76779,191.188,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" halign="1" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24347,12 +24354,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24360,7 +24367,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24384,7 +24391,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24394,9 +24401,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,6.45237,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" sectionWidth="56.3557" sectionHeight="5.76" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24409,12 +24416,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="26.8205,6.82826,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 3.0" opacity="1" referencePoint="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" valign="32" id="" positionOnPage="209.146,198.083,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24422,7 +24445,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24446,7 +24469,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24456,9 +24479,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.1638,7.07327,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" valign="32" id="" positionOnPage="62.6706,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24471,12 +24494,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24484,7 +24507,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24508,7 +24531,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24518,9 +24541,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="64.7594,7.10512,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" valign="32" id="" positionOnPage="116.805,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24533,12 +24556,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24546,7 +24569,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24570,7 +24593,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24580,9 +24603,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="52.7903,7.07327,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Page [% @atlas_featurenumber %]" opacity="1" referencePoint="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" valign="32" id="" positionOnPage="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" halign="1" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24595,12 +24618,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24608,7 +24631,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24632,7 +24655,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24642,71 +24665,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="52.7903,7.07327,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" blendMode="0" pictureHeight="29.8354">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="29.8354" northOffset="0" size="49.3143,29.8354,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.6535" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" id="" positionOnPage="243.098,175.353,mm" mode="1" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" anchorPoint="8" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24726,9 +24687,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" id="" positionOnPage="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24741,7 +24702,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24749,7 +24710,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -24773,9 +24734,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="33.2496" numUnitsPerSegment="20" zValue="2" numSegments="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="109.51,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2" alignment="0" background="false" labelVerticalPlacement="0" numSegments="2" outlineWidth="0.2" minBarWidth="25" labelHorizontalPlacement="0" opacity="1" position="6.76779,2.8482,mm" type="65646" numUnitsPerSegment="20" itemRotation="0" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" subdivisionsHeight="1.5" boxContentSpace="0.2" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="33.2496" positionOnPage="6.76779,2.8482,mm" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" size="109.51,15.8378,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="1" style="Double Box" segmentSizeMode="1" lineJoinStyle="round" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="100" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24788,12 +24749,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24801,7 +24762,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -24825,7 +24786,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -24834,7 +24795,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -24846,10 +24807,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24857,7 +24818,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24898,7 +24859,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24906,7 +24867,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24947,7 +24908,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24955,7 +24916,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24996,7 +24957,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25004,7 +24965,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25029,7 +24990,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25037,7 +24998,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25062,9 +25023,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" isTemporal="0" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="283.418,180.92,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="0.9" referencePoint="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Fencing" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" id="" positionOnPage="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25099,7 +25060,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" ymin="-33.90817940102677852" xmax="18.40522072458854552"/>
+        <Extent ymax="-33.90720180625849167" xmin="18.40368928312333452" xmax="18.40522072458854552" ymin="-33.90817940102677852"/>
         <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>
@@ -25114,9 +25075,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25124,7 +25085,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25165,7 +25126,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25173,7 +25134,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -25216,12 +25177,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -25229,7 +25190,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -25253,7 +25214,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25275,13 +25236,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -25307,13 +25283,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="fence_and_cone_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerProvider="virtual" sortKey="&quot;group&quot;" coverageLayerName="fence_and_cone_groups" enabled="1" pageNameExpression="&quot;name&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0"/>
+      <Grid resolution="9" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25321,7 +25297,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -25344,9 +25320,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25359,7 +25335,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25367,7 +25343,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -25392,12 +25368,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" position="4.43449,186.634,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Directions to Start of Race" opacity="1" referencePoint="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" valign="64" id="" positionOnPage="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25410,12 +25386,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25423,7 +25399,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25447,7 +25423,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25457,9 +25433,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" position="4.43449,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" itemRotation="0" id="" halign="1" visibility="1" positionLock="false" marginY="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="48.2923,9.511,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Gun Run" opacity="1" referencePoint="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" valign="32" id="" positionOnPage="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25472,12 +25448,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25485,7 +25461,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25509,7 +25485,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25519,9 +25495,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="6" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" type="65642" legendFilterByMap="1" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="round" itemRotation="0" position="10.096,10.8563,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" frame="true" symbolHeight="5" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="0" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" size="59.0766,76,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="9" positionLock="false">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="0" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="10.096,10.8563,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="10.096,10.8563,mm" columnCount="1" visibility="1" legendFilterByMap="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" size="59.0766,76,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="9" equalColumnWidth="0" frameJoinStyle="round" groupUuid="" rasterBorderWidth="0" positionLock="false" zValue="6" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor red="139" green="139" alpha="255" blue="139"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25534,14 +25510,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="7.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="7.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25549,7 +25528,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25573,7 +25552,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25583,13 +25562,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25597,7 +25576,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25621,7 +25600,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25631,13 +25610,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25645,7 +25624,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25669,7 +25648,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25679,13 +25658,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25693,7 +25672,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25717,7 +25696,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25727,13 +25706,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="3" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="6.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -25741,7 +25720,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -25765,7 +25744,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25786,7 +25765,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="Start/Finish" type="QString"/>
@@ -25799,7 +25778,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
@@ -25813,9 +25792,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" position="221.862,190.027,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="27.7839,6.871,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.0" opacity="1" referencePoint="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="221.862,190.027,mm" valign="32" id="" positionOnPage="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25828,12 +25807,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25841,7 +25820,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25865,7 +25844,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25875,9 +25854,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" position="197.975,197.498,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" itemRotation="0" id="" halign="2" visibility="1" positionLock="false" marginY="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="197.975,197.498,mm" valign="64" id="" positionOnPage="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" halign="2" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25890,12 +25869,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25903,7 +25882,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -25927,7 +25906,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25937,9 +25916,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" position="249.646,179.724,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="false" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" blendMode="0" pictureHeight="24.3824">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="24.3824" northOffset="0" size="42.9838,24.3824,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="24.2337" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="249.646,179.724,mm" id="" positionOnPage="249.646,179.724,mm" mode="1" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" anchorPoint="4" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25959,9 +25938,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="4.58449,197.248,mm" position="4.58449,197.248,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="244.912,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="244.912,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" id="" positionOnPage="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25974,7 +25953,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -25982,7 +25961,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26006,9 +25985,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="4.43449,6.411,mm" position="4.43449,6.411,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="288.007,183.616,mm" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" isTemporal="0" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="288.007,183.616,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Ask Me" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" id="" positionOnPage="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26037,7 +26016,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" 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>
@@ -26052,9 +26031,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26062,7 +26041,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26103,7 +26082,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26111,7 +26090,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -26143,12 +26122,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26156,7 +26135,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -26180,7 +26159,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26202,12 +26181,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -26225,13 +26204,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="" coverageLayer="" enabled="0" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas coverageLayer="" enabled="0" pageNameExpression="" filterFeatures="0" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26239,7 +26218,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26262,9 +26241,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -26277,7 +26256,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26285,7 +26264,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -26310,12 +26289,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="13" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="200.171,199.082,mm" position="200.171,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.8714,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 1.1" opacity="1" referencePoint="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="200.171,199.082,mm" valign="32" id="" positionOnPage="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" halign="2" visibility="1" zValue="13">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26328,12 +26307,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26341,7 +26320,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26365,7 +26344,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26375,9 +26354,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="12" background="false" type="65641" labelText="Gun Run 2023: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" position="9.7863,192.073,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Gun Run 2023: [%&quot;Source&quot;%]" opacity="1" referencePoint="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" valign="64" id="" positionOnPage="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" halign="1" visibility="1" zValue="12">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26390,12 +26369,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26403,7 +26382,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26427,7 +26406,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26437,9 +26416,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="11" background="false" type="65641" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" positionOnPage="9.7863,199.082,mm" position="9.7863,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" opacity="1" referencePoint="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" valign="32" id="" positionOnPage="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" halign="1" visibility="1" zValue="11">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26452,12 +26431,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26465,7 +26444,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -26489,7 +26468,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26499,9 +26478,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="10" background="false" mode="1" type="65640" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" blendMode="0" pictureHeight="16.8993">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="16.8993" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.7523" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2023_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" anchorPoint="4" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26521,9 +26500,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65643" positionOnPage="9.57644,198.832,mm" position="9.57644,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.982,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.982,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" id="" positionOnPage="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26536,7 +26515,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26544,7 +26523,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -26568,9 +26547,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="true" type="65639" positionOnPage="9.57644,5.42566,mm" position="9.57644,5.42566,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="107.861,186.385,mm" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="107.861,186.385,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="9.57644,5.42566,mm" id="Trail Finish" positionOnPage="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26589,18 +26568,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="true" type="65639" positionOnPage="112.643,4.09761,mm" position="112.643,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="179.156,189.279,mm" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="179.156,189.279,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="112.643,4.09761,mm" id="Trail Start" positionOnPage="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26619,18 +26598,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="67.7828,166.874,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" id="Left inset 21KM" positionOnPage="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26674,18 +26653,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="true" type="65639" positionOnPage="133.191,119.125,mm" position="133.191,119.125,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="113.3,76.1023,mm" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPreset="true" blendMode="0">
-        <FrameColor blue="144" green="34" red="103" alpha="255"/>
-        <BackgroundColor blue="215" green="175" red="200" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="113.3,76.1023,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="133.191,119.125,mm" id="Bottom inset 21KM" positionOnPage="133.191,119.125,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="5">
+        <FrameColor red="103" green="34" alpha="255" blue="144"/>
+        <BackgroundColor red="200" green="175" alpha="255" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26704,18 +26683,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="true" type="65639" positionOnPage="19.6693,7.89412,mm" position="19.6693,7.89412,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="68.3676,117.12,mm" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="68.3676,117.12,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="19.6693,7.89412,mm" id="End inset Trail" positionOnPage="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26734,18 +26713,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="true" type="65639" positionOnPage="170.062,49.6297,mm" position="170.062,49.6297,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="63.655,88.3012,mm" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="63.655,88.3012,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="170.062,49.6297,mm" id="Start inset Trail" positionOnPage="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26764,18 +26743,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="200.321,125.314,mm" position="200.321,125.314,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="75.8756,69.7635,mm" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="0" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="75.8756,69.7635,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Routes" outlineWidthM="0.3,mm" position="200.321,125.314,mm" id="Contour inset Trail" positionOnPage="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" isTemporal="0" visibility="0" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26794,18 +26773,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.50144,5.50066,mm" position="9.50144,5.50066,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="true" groupUuid="" excludeFromExports="0" size="282.372,186.105,mm" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" isTemporal="0" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.372,186.105,mm" drawCanvasItems="true" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="Routes" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" id="Main Map" positionOnPage="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26834,11 +26813,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975544251812778" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45388998618362919"/>
+        <Extent ymax="-33.89788705253309331" xmin="18.39199999999999946" xmax="18.4103786110779204" ymin="-33.90999999999999659"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26846,7 +26825,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26887,7 +26866,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26895,7 +26874,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -26927,12 +26906,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26940,7 +26919,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -26964,7 +26943,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26986,8 +26965,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" position="3" centered="0" inverted="0" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview centered="0" name="Overview 1" show="1" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27001,7 +26980,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27037,12 +27016,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -27067,13 +27046,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;Sort&quot;" filterFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="1" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1"/>
+      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerProvider="ogr" sortKey="&quot;Sort&quot;" coverageLayerName="all_routes" enabled="1" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" hideCoverage="0"/>
     </Layout>
-    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27081,7 +27060,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27104,9 +27083,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="594,841,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27119,7 +27098,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27127,7 +27106,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27153,9 +27132,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="8" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="25.5925,18.7971,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" size="4,4,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="25.5925,18.7971,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="false" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="25.5925,18.7971,mm" columnCount="1" visibility="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" size="4,4,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="8" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27168,14 +27147,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27183,7 +27165,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27207,7 +27189,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27217,13 +27199,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27231,7 +27213,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27255,7 +27237,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27265,13 +27247,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27279,7 +27261,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27303,7 +27285,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27313,13 +27295,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27327,7 +27309,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27351,7 +27333,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27361,13 +27343,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27375,7 +27357,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27399,7 +27381,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27418,7 +27400,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes20170907054841602" expanded="1" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer name="all_routes" expanded="1" id="all_routes20170907054841602" checked="Qt::Checked" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
@@ -27432,9 +27414,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" position="5.2963,808.939,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="MARSHAL POSITIONS" opacity="1" referencePoint="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" valign="64" id="" positionOnPage="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" halign="1" visibility="1" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27447,12 +27429,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27460,7 +27442,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27484,7 +27466,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27494,9 +27476,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" position="430.403,825.052,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.2" opacity="1" referencePoint="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="430.403,825.052,mm" valign="32" id="" positionOnPage="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27509,12 +27491,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27522,7 +27504,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27546,7 +27528,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27556,9 +27538,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" position="372.175,808.942,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="114.848,15.0635,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="372.175,808.942,mm" valign="64" id="" positionOnPage="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" halign="2" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27571,12 +27553,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27584,7 +27566,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -27608,7 +27590,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27618,9 +27600,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" position="489.557,775.395,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" blendMode="0" pictureHeight="63.9757">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="63.9757" northOffset="0" size="100.498,63.9757,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="63.5856" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="489.557,775.395,mm" id="" positionOnPage="489.557,775.395,mm" mode="1" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" anchorPoint="8" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27640,9 +27622,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.4463,824.155,mm" position="5.4463,824.155,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="481.428,0.606138,mm" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="481.428,0.606138,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" id="" positionOnPage="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27655,7 +27637,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27663,7 +27645,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27687,9 +27669,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="3.94474,5.25965,mm" position="3.94474,5.25965,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="584.759,811.213,mm" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="584.759,811.213,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal plan" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" id="" positionOnPage="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27718,14 +27700,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -27736,13 +27718,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerProvider="virtual" sortKey="page" coverageLayerName="complete_marshal_overview" enabled="1" pageNameExpression="&quot;page&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -27750,7 +27732,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -27773,9 +27755,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27788,7 +27770,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -27796,7 +27778,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -27821,12 +27803,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="15" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="244.484,130.172,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="244.484,130.172,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="0" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" groupUuid="" size="34.45,40.8,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="244.484,130.172,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="244.484,130.172,mm" columnCount="1" visibility="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" size="34.45,40.8,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="0" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="15">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27840,13 +27822,13 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27854,7 +27836,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27878,7 +27860,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27888,13 +27870,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27902,7 +27884,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27926,7 +27908,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27936,13 +27918,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27950,7 +27932,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -27974,7 +27956,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27984,13 +27966,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -27998,7 +27980,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -28022,7 +28004,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28032,13 +28014,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -28046,7 +28028,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -28070,7 +28052,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28089,7 +28071,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -28101,9 +28083,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="ACCESS ROUTES FOR RESIDENTS" opacity="1" referencePoint="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" valign="64" id="" positionOnPage="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28116,12 +28098,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28129,7 +28111,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28153,7 +28135,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28163,9 +28145,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.1" opacity="1" referencePoint="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" valign="64" id="" positionOnPage="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" halign="2" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28178,12 +28160,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28191,7 +28173,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28215,7 +28197,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28225,9 +28207,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" valign="64" id="" positionOnPage="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28240,12 +28222,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28253,7 +28235,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28277,7 +28259,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28287,9 +28269,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" blendMode="0" pictureHeight="17.4718">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="17.4718" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="17.3653" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" anchorPoint="4" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28309,9 +28291,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" id="" positionOnPage="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28324,7 +28306,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28332,7 +28314,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -28356,9 +28338,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="true" type="65639" positionOnPage="5.86559,4.09761,mm" position="5.86559,4.09761,mm" outlineWidthM="0.3,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="67.7828,166.874,mm" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="67.7828,166.874,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Access Routes" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" id="" positionOnPage="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28402,7 +28384,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" 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>
@@ -28417,9 +28399,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28427,7 +28409,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28468,7 +28450,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28476,7 +28458,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28508,12 +28490,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28521,7 +28503,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -28545,7 +28527,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28567,16 +28549,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,9.08557,mm" position="9.44946,9.08557,mm" outlineWidthM="0.15,mm" opacity="1" frame="true" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,175.592,mm" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" isTemporal="0" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.012,175.592,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="true" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="Access Routes" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" id="" positionOnPage="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28605,7 +28587,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" 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>
@@ -28620,9 +28602,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28630,7 +28612,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28671,7 +28653,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28679,7 +28661,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28711,12 +28693,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28724,7 +28706,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -28748,7 +28730,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28770,12 +28752,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28793,13 +28775,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="1" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" coverageLayerName="residents_access" enabled="1" pageNameExpression="&quot;FID&quot;" filterFeatures="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28807,7 +28789,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -28830,9 +28812,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28845,7 +28827,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28853,7 +28835,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -28878,12 +28860,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide orientation="2" units="mm" page="0" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" position="9.37446,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="194.851,7.272,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Access to P9 Parking and VIP Tent" opacity="1" referencePoint="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" valign="64" id="" positionOnPage="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" halign="1" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28896,12 +28878,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28909,7 +28891,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28933,7 +28915,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28943,9 +28925,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" position="204.225,191.81,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="REVISION 1.0" opacity="1" referencePoint="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" valign="64" id="" positionOnPage="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" halign="2" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28958,12 +28940,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28971,7 +28953,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -28995,7 +28977,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29005,9 +28987,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" position="210.038,199.082,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Sunday, 20 October 2019" opacity="1" referencePoint="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" valign="64" id="" positionOnPage="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" halign="2" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29020,12 +29002,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29033,7 +29015,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29057,7 +29039,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29067,9 +29049,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" position="262.196,188.218,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="4" frame="false" groupUuid="" excludeFromExports="0" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" blendMode="0" pictureHeight="17.4718">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="17.4718" northOffset="0" size="29.7523,17.4718,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="17.3653" frame="false" blendMode="0" background="false" opacity="1" file="../Gun_Run_Logo.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" id="" positionOnPage="262.196,188.218,mm" mode="1" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" anchorPoint="4" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29089,9 +29071,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="9.59946,198.832,mm" position="9.59946,198.832,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="251.959,0.1,mm" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="251.959,0.1,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" id="" positionOnPage="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29104,7 +29086,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29112,7 +29094,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -29136,9 +29118,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="round" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="9.44946,7.25098,mm" position="9.44946,7.25098,mm" outlineWidthM="0.15,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="282.012,182.649,mm" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" isTemporal="0" followPresetName="" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPreset="false" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="282.012,182.649,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" groupUuid="" frameJoinStyle="round" itemRotation="0" followPresetName="" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" id="" positionOnPage="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" isTemporal="0" visibility="1" followPreset="false" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29167,7 +29149,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" 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>
@@ -29182,9 +29164,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="0" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="0" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="0" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="0" bottomAnnotationPosition="1" annotationFormat="0" intervalX="0" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="0" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="0" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="0" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="0" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="0" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="0" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="0" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="0" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29192,7 +29174,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -29233,7 +29215,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29241,7 +29223,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -29273,12 +29255,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -29286,7 +29268,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -29310,7 +29292,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29332,12 +29314,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29355,13 +29337,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filterFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
+      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" coverageLayerName="residents_access" enabled="0" pageNameExpression="&quot;FID&quot;" filterFeatures="0" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29369,7 +29351,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -29392,9 +29374,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,420,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29407,7 +29389,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29415,7 +29397,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -29441,9 +29423,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" position="112.086,406.476,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" itemRotation="0" id="" halign="4" visibility="1" positionLock="true" marginY="1" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" valign="32" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="23.5967,8.3142,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" sectionWidth="23.5967" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="112.086,406.476,mm" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionOnPage="112.086,406.476,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29456,12 +29438,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="27.7839,7.51682,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 5.0" opacity="1" referencePoint="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="214.292,406.874,mm" valign="32" id="" positionOnPage="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29469,7 +29467,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29493,7 +29491,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29503,71 +29501,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 5.0" positionOnPage="214.292,406.874,mm" position="214.292,406.874,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="15.6525,12.5708,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" frame="false" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" size="21.6797,33,mm" symbolAlignment="1" blendMode="0" resizeToContents="1" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="15.6525,12.5708,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="false" symbolHeight="4" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="1" legendFilterByAtlas="0" positionOnPage="15.6525,12.5708,mm" columnCount="1" visibility="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" size="21.6797,33,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="7" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29580,14 +29516,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="6.6444479999999997" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="16" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="6.6444479999999997" fontSize="16" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29595,7 +29534,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29619,7 +29558,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29629,13 +29568,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.9388920000000001" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="14" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.9388920000000001" fontSize="14" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29643,7 +29582,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29667,7 +29606,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29677,13 +29616,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="1">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29691,7 +29630,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29715,7 +29654,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29725,13 +29664,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2">
+            <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29739,7 +29678,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29763,7 +29702,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29773,13 +29712,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -29787,7 +29726,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -29811,7 +29750,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29830,7 +29769,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29844,9 +29783,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" position="5.69321,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" valign="64" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="45.1194,8.13137,mm" marginY="1" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="MARSHAL POSITIONS" opacity="1" referencePoint="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" valign="64" id="" positionOnPage="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29859,12 +29798,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29872,7 +29811,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -29896,7 +29835,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29906,9 +29845,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="5.69321,406.988,mm" position="5.69321,406.988,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="1" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" valign="32" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="118.192,7.80192,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" sectionWidth="118.192" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionOnPage="5.69321,406.988,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29921,56 +29860,10 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="4" background="false" type="65641" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="148.501,398.344,mm" position="148.501,398.344,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="1" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="93.5757,8.13167,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" sectionWidth="93.5757" sectionHeight="7.2" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="148.501,398.344,mm" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionOnPage="148.501,398.344,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29983,56 +29876,10 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="3" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.319,382.696,mm" position="243.319,382.696,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="31.1059" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" blendMode="0" pictureHeight="31.2967">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="31.2967" northOffset="0" size="49.3143,31.2967,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="31.1059" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.319,382.696,mm" id="" positionOnPage="243.319,382.696,mm" mode="1" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" anchorPoint="8" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30052,9 +29899,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="2" background="false" type="65643" positionOnPage="5.84321,406.626,mm" position="5.84321,406.626,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="236.083,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="236.083,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" id="" positionOnPage="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30067,7 +29914,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30075,7 +29922,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30099,9 +29946,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="true" type="65639" positionOnPage="5.03,5.9483,mm" position="5.03,5.9483,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="286.94,392.396,mm" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" isTemporal="0" followPresetName="Marshal plan" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="286.94,392.396,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Marshal plan" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" id="" positionOnPage="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30130,15 +29977,60 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" ymin="-33.91890002608484167" xmax="18.41474568521422484"/>
+        <Extent ymax="-33.89580042337001231" xmin="18.39785407807089612" xmax="18.41474568521422484" ymin="-33.91890002608484167"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" html="Page [% &quot;page&quot; %] ">
+        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" html="&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>">
+        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" html="&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>">
+        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -30155,13 +30047,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="page" filterFeatures="0" pageNameExpression="&quot;page&quot;" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" sortAscending="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerProvider="ogr" sortKey="page" coverageLayerName="marshal_overviews" enabled="1" pageNameExpression="&quot;page&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
-    <Layout units="mm" name="Fencing - Cones only" printResolution="300" worldFileMap="">
+    <Layout name="Fencing - Cones only" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGrid="0" tolerance="5" snapToItems="1" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0"/>
+      <Grid resolution="10" offsetX="0" offsetUnits="mm" resUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30169,7 +30061,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30192,9 +30084,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="0" background="true" type="65638" positionOnPage="0,0,mm" position="0,0,mm" outlineWidthM="0.3,mm" opacity="1" frame="false" groupUuid="" excludeFromExports="0" size="297,210,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" visibility="1" positionLock="false" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem size="297,210,mm" type="65638" excludeFromExports="0" frame="false" blendMode="0" background="true" opacity="1" referencePoint="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="0,0,mm" id="" positionOnPage="0,0,mm" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" visibility="1" zValue="0">
+          <FrameColor red="0" green="0" alpha="255" blue="0"/>
+          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -30207,7 +30099,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30215,7 +30107,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -30241,9 +30133,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" rasterBorderWidth="0" title="" wrapChar="" opacity="1" columnCount="1" zValue="11" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" type="65642" splitLayer="0" titleAlignment="1" visibility="1" frameJoinStyle="miter" itemRotation="0" position="256.808,5.21277,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" frame="true" symbolHeight="4" referencePoint="0" maxSymbolSize="0" rasterBorderColor="0,0,0,255" id="" equalColumnWidth="1" columnSpace="2" background="true" excludeFromExports="0" boxSpace="2" wmsLegendHeight="25" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" size="38.1563,53.7608,mm" symbolAlignment="1" blendMode="0" resizeToContents="0" symbolWidth="7" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem titleAlignment="1" columnSpace="2" maxSymbolSize="0" background="true" rasterBorderColor="0,0,0,255" boxSpace="2" opacity="1" position="256.808,5.21277,mm" symbolAlignment="1" type="65642" splitLayer="0" itemRotation="0" wmsLegendWidth="50" frame="true" symbolHeight="4" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wrapChar="" blendMode="0" title="" minSymbolSize="0" referencePoint="0" rasterBorder="1" resizeToContents="0" legendFilterByAtlas="0" positionOnPage="256.808,5.21277,mm" columnCount="1" visibility="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" size="38.1563,53.7608,mm" wmsLegendHeight="25" id="" excludeFromExports="0" outlineWidthM="0.3,mm" symbolWidth="7" equalColumnWidth="1" frameJoinStyle="miter" groupUuid="" rasterBorderWidth="0" positionLock="true" zValue="11" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30256,14 +30148,17 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
+        <filterByMaps>
+          <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
+        </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30271,7 +30166,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30295,7 +30190,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30305,13 +30200,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="5.2333359999999995" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="group" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="5.2333359999999995" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30319,7 +30214,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30343,7 +30238,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30353,13 +30248,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="75" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="subgroup" indent="0" alignment="1" marginTop="3">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="75" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30367,7 +30262,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30391,7 +30286,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30401,13 +30296,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="9" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
+            <text-style capitalization="0" multilineHeight="1" fontSize="9" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30415,7 +30310,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30439,7 +30334,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30449,13 +30344,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginTop="2" marginLeft="2">
-            <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="4.5277799999999999" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="MM" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <style name="symbolLabel" indent="0" alignment="1" marginLeft="2" marginTop="2">
+            <text-style capitalization="0" multilineHeight="4.5277799999999999" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="MM" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-              <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-                <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+              <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+              <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+              <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+                <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -30463,7 +30358,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                     <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"/>
@@ -30487,7 +30382,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+              <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30506,7 +30401,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="fencing" expanded="1" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -30522,7 +30417,7 @@ def my_form_open(dialog, layer, feature):
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0" providerKey="ogr">
+            <layer-tree-layer name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" checked="Qt::Checked" providerKey="ogr" legend_split_behavior="0" legend_exp="" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -30536,9 +30431,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="10" background="false" type="65641" labelText="CONES: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" position="6.76779,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="148.46,6.45211,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="148.46,6.45211,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="CONES: [% &quot;name&quot; %]" opacity="1" referencePoint="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" valign="32" id="" positionOnPage="6.76779,191.188,mm" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" halign="1" visibility="1" zValue="10">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30551,12 +30446,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="63" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="63" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30564,7 +30459,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30588,7 +30483,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30598,9 +30493,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="9" background="false" type="65641" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" position="182.723,191.188,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="56.3557,6.45237,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" valign="64" blendMode="0" htmlState="1">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="56.3557,6.45237,mm" type="65647" excludeFromExports="0" frame="false" blendMode="0" background="false" hideBackgroundIfEmpty="0" opacity="1" referencePoint="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" sectionWidth="56.3557" sectionHeight="5.76" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionOnPage="182.723,191.188,mm" hidePageIfEmpty="0" sectionX="0" sectionY="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" visibility="1" zValue="9">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30613,12 +30508,28 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+      </LayoutItem>
+      <LayoutItem size="26.8205,6.82826,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="REVISION 3.0" opacity="1" referencePoint="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" valign="32" id="" positionOnPage="209.146,198.083,mm" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" halign="2" visibility="1" zValue="8">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30626,7 +30537,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30650,7 +30561,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30660,9 +30571,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="8" background="false" type="65641" labelText="REVISION 3.0" positionOnPage="209.146,198.083,mm" position="209.146,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="26.8205,6.82826,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" itemRotation="0" id="" halign="2" visibility="1" positionLock="true" marginY="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="51.1638,7.07327,mm" marginY="1" type="65641" excludeFromExports="0" marginX="1" frame="false" blendMode="0" background="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" valign="32" id="" positionOnPage="62.6706,198.083,mm" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" halign="1" visibility="0" zValue="7">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30675,12 +30586,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30688,7 +30599,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30712,7 +30623,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30722,9 +30633,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="7" background="false" type="65641" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" position="62.6706,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="1" frame="false" groupUuid="" excludeFromExports="0" size="51.1638,7.07327,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" itemRotation="0" id="" halign="1" visibility="0" positionLock="true" marginY="1" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="64.7594,7.10512,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" opacity="1" referencePoint="0" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" valign="32" id="" positionOnPage="116.805,198.083,mm" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionLock="true" halign="1" visibility="1" zValue="6">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30737,12 +30648,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30750,7 +30661,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30774,7 +30685,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30784,9 +30695,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="6" background="false" type="65641" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" position="116.805,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="64.7594,7.10512,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="90.2083,7.07327,mm" marginY="0" type="65641" excludeFromExports="0" marginX="0" frame="false" blendMode="0" background="false" labelText="Page [% @atlas_featurenumber %]" opacity="1" referencePoint="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" frameJoinStyle="miter" itemRotation="0" htmlState="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" valign="32" id="" positionOnPage="6.76779,198.083,mm" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" halign="1" visibility="1" zValue="5">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30799,12 +30710,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30812,7 +30723,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -30836,7 +30747,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30846,71 +30757,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="5" background="false" type="65641" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" position="6.76779,198.083,mm" outlineWidthM="0.3,mm" opacity="1" marginX="0" frame="false" groupUuid="" excludeFromExports="0" size="90.2083,7.07327,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" itemRotation="0" id="" halign="1" visibility="1" positionLock="true" marginY="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" valign="32" blendMode="0" htmlState="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
-          <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
-                  <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
-                <Option type="Map">
-                  <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="color" value="255,255,255,255" type="QString"/>
-                  <Option name="joinstyle" value="bevel" type="QString"/>
-                  <Option name="offset" value="0,0" type="QString"/>
-                  <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                  <Option name="offset_unit" value="MM" type="QString"/>
-                  <Option name="outline_color" value="128,128,128,255" type="QString"/>
-                  <Option name="outline_style" value="no" type="QString"/>
-                  <Option name="outline_width" value="0" type="QString"/>
-                  <Option name="outline_width_unit" value="MM" type="QString"/>
-                  <Option name="style" value="solid" type="QString"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" value="" type="QString"/>
-                    <Option name="properties"/>
-                    <Option name="type" value="collection" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option name="name" value="" type="QString"/>
-              <Option name="properties"/>
-              <Option name="type" value="collection" type="QString"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" northMode="0" svgBorderColor="0,0,0,255" referencePoint="0" zValue="4" background="false" mode="1" type="65640" file="../GunRun2022_250.png" positionOnPage="243.098,175.353,mm" position="243.098,175.353,mm" outlineWidthM="0.3,mm" opacity="1" pictureWidth="29.6535" svgFillColor="255,255,255,255" mapUuid="" anchorPoint="8" frame="false" groupUuid="" excludeFromExports="0" size="49.3143,29.8354,mm" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" resizeMode="0" svgBorderWidth="0.2" pictureRotation="0" id="" visibility="1" positionLock="true" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northOffset="0" blendMode="0" pictureHeight="29.8354">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem pictureHeight="29.8354" northOffset="0" size="49.3143,29.8354,mm" svgFillColor="255,255,255,255" type="65640" excludeFromExports="0" northMode="0" pictureWidth="29.6535" frame="false" blendMode="0" background="false" opacity="1" file="../GunRun2022_250.png" resizeMode="0" referencePoint="0" svgBorderWidth="0.2" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" mapUuid="" groupUuid="" frameJoinStyle="miter" itemRotation="0" svgBorderColor="0,0,0,255" pictureRotation="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" id="" positionOnPage="243.098,175.353,mm" mode="1" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" anchorPoint="8" visibility="1" zValue="4">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30930,9 +30779,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="3" background="false" type="65643" positionOnPage="6.91779,197.79,mm" position="6.91779,197.79,mm" outlineWidthM="0.3,mm" opacity="1" shapeType="1" frame="false" groupUuid="" excludeFromExports="0" size="232.01,0.14328,mm" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" visibility="1" positionLock="true" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem size="232.01,0.14328,mm" type="65643" excludeFromExports="0" frame="false" blendMode="0" background="false" opacity="1" referencePoint="0" shapeType="1" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" frameJoinStyle="miter" itemRotation="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" id="" positionOnPage="6.91779,197.79,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" cornerRadiusMeasure="0,mm" visibility="1" zValue="3">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30945,7 +30794,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30953,7 +30802,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" enabled="1" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" pass="0" locked="0" enabled="1">
             <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"/>
@@ -30977,9 +30826,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem minBarWidth="25" opacity="1" lineJoinStyle="round" numSegmentsLeft="2" unitLabel="m" labelVerticalPlacement="0" segmentMillimeters="26.1864" numUnitsPerSegment="30" zValue="2" numSegments="2" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" segmentSizeMode="1" type="65646" subdivisionsHeight="1.5" height="2" numSubdivisions="1" lineCapStyle="square" outlineWidth="0.2" visibility="1" frameJoinStyle="miter" itemRotation="0" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" frame="false" referencePoint="0" style="Double Box" unitType="meters" maxBarWidth="100" boxContentSpace="0.2" id="" background="false" excludeFromExports="0" labelHorizontalPlacement="0" alignment="0" groupUuid="" size="88.3204,15.8378,mm" blendMode="0" labelBarSpace="1" positionLock="true">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem lineCapStyle="square" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" height="2" alignment="0" background="false" labelVerticalPlacement="0" numSegments="2" outlineWidth="0.2" minBarWidth="25" labelHorizontalPlacement="0" opacity="1" position="6.76779,2.8482,mm" type="65646" numUnitsPerSegment="30" itemRotation="0" frame="false" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" subdivisionsHeight="1.5" boxContentSpace="0.2" numMapUnitsPerScaleBarUnit="1" blendMode="0" referencePoint="0" segmentMillimeters="26.1864" positionOnPage="6.76779,2.8482,mm" visibility="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" size="88.3204,15.8378,mm" id="" excludeFromExports="0" outlineWidthM="0.3,mm" labelBarSpace="1" style="Double Box" segmentSizeMode="1" lineJoinStyle="round" unitType="meters" frameJoinStyle="miter" numSubdivisions="1" maxBarWidth="100" groupUuid="" unitLabel="m" numSegmentsLeft="2" positionLock="true" zValue="2">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30992,12 +30841,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="12" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+        <text-style capitalization="0" multilineHeight="1" fontSize="12" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-          <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-            <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="0" maskedSymbolLayers="" maskType="0"/>
+          <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+            <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31005,7 +30854,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                 <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"/>
@@ -31029,7 +30878,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31038,7 +30887,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor red="0" green="0" alpha="255" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -31050,10 +30899,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor red="0" green="0" alpha="255" blue="0"/>
+        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31061,7 +30910,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31102,7 +30951,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31110,7 +30959,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31151,7 +31000,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31159,7 +31008,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" enabled="1" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" pass="0" locked="0" enabled="1">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -31200,7 +31049,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31208,7 +31057,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -31233,7 +31082,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31241,7 +31090,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" enabled="1" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" pass="0" locked="0" enabled="1">
               <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"/>
@@ -31266,9 +31115,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem frameJoinStyle="miter" referencePoint="0" zValue="1" background="false" type="65639" positionOnPage="6.76779,9.35102,mm" position="6.76779,9.35102,mm" outlineWidthM="0.3,mm" opacity="0.9" frame="false" drawCanvasItems="false" groupUuid="" excludeFromExports="0" size="283.418,180.92,mm" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" isTemporal="0" followPresetName="Cones" labelMargin="0,mm" mapFlags="0" keepLayerSet="false" visibility="1" positionLock="true" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPreset="true" blendMode="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem keepLayerSet="false" size="283.418,180.92,mm" drawCanvasItems="false" type="65639" excludeFromExports="0" mapRotation="0" frame="false" blendMode="0" background="false" opacity="0.9" referencePoint="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" mapFlags="0" groupUuid="" frameJoinStyle="miter" itemRotation="0" followPresetName="Cones" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" id="" positionOnPage="6.76779,9.35102,mm" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" positionLock="true" isTemporal="0" visibility="1" followPreset="true" labelMargin="0,mm" zValue="1">
+        <FrameColor red="0" green="0" alpha="255" blue="0"/>
+        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31303,7 +31152,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" ymin="-33.92052446432401069" xmax="18.3837273348683965"/>
+        <Extent ymax="-33.91866254684331494" xmin="18.38081056635935795" xmax="18.3837273348683965" ymin="-33.92052446432401069"/>
         <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>
@@ -31318,9 +31167,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameMargin="0" rotatedTicksMarginToCorner="0" bottomAnnotationDisplay="3" name="Grid 1" gridFramePenColor="0,0,0,255" topFrameDivisions="0" frameFillColor1="255,255,255,255" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" gridFrameStyle="0" leftAnnotationDirection="0" rotatedAnnotationsEnabled="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" gridStyle="0" rotatedTicksEnabled="0" unit="1" rotatedAnnotationsMinimumAngle="0" show="0" gridFramePenThickness="0.5" minimumIntervalWidth="50" rotatedTicksLengthMode="0" rotatedAnnotationsMarginToCorner="0" leftFrameDivisions="0" leftAnnotationDisplay="3" rightFrameDivisions="0" leftAnnotationPosition="1" position="3" topAnnotationDisplay="3" bottomAnnotationPosition="1" annotationFormat="4" intervalX="5" gridFrameWidth="2" gridFrameSideFlags="15" bottomAnnotationDirection="0" rightAnnotationPosition="1" offsetY="0" topAnnotationPosition="1" rotatedAnnotationsLengthMode="0" offsetX="0" rightAnnotationDisplay="3" topAnnotationDirection="0" showAnnotation="0" annotationPrecision="3" blendMode="0" crossLength="3" maximumIntervalWidth="100" intervalY="5" bottomFrameDivisions="0" frameAnnotationDistance="1" rightAnnotationDirection="0">
+        <ComposerMapGrid rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" rightAnnotationDirection="0" leftAnnotationDirection="0" annotationPrecision="3" frameFillColor2="0,0,0,255" rotatedTicksEnabled="0" gridFrameSideFlags="15" position="3" name="Grid 1" frameAnnotationDistance="1" rightAnnotationDisplay="3" topAnnotationDirection="0" show="0" frameFillColor1="255,255,255,255" intervalX="5" rotatedAnnotationsEnabled="0" bottomAnnotationDisplay="3" gridFramePenThickness="0.5" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" topAnnotationPosition="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" annotationExpression="" blendMode="0" rotatedAnnotationsMinimumAngle="0" gridFramePenColor="0,0,0,255" annotationFormat="4" bottomAnnotationDirection="0" maximumIntervalWidth="100" bottomFrameDivisions="0" unit="1" showAnnotation="0" rotatedAnnotationsMarginToCorner="0" intervalY="5" minimumIntervalWidth="50" rotatedTicksMinimumAngle="0" offsetX="0" rightAnnotationPosition="1" rightFrameDivisions="0" gridStyle="0" gridFrameWidth="2" crossLength="3" leftFrameDivisions="0" topFrameDivisions="0" rotatedTicksLengthMode="0" leftAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0">
           <lineStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="line" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31328,7 +31177,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" enabled="1" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -31369,7 +31218,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" clip_to_extent="1" type="marker" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31377,7 +31226,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" enabled="1" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" pass="0" locked="0" enabled="1">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -31420,12 +31269,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeUnit="Point" textOpacity="1" fontLetterSpacing="0" allowHtml="0" fontFamily="Myriad Pro" capitalization="0" fontItalic="0" forcedBold="0" multilineHeight="1" fontWordSpacing="0" fontUnderline="0" multilineHeightUnit="Percentage" fontSize="10" textOrientation="horizontal" fontKerning="1" textColor="0,0,0,255" fontStrikeout="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontWeight="50" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0">
+          <text-style capitalization="0" multilineHeight="1" fontSize="10" namedStyle="" textOpacity="1" textOrientation="horizontal" blendMode="0" fontWeight="50" fontUnderline="0" multilineHeightUnit="Percentage" fontStrikeout="0" forcedBold="0" fontItalic="0" fontLetterSpacing="0" fontKerning="1" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" allowHtml="0" fontSizeUnit="Point" fontFamily="Myriad Pro">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferColor="255,255,255,255" bufferDraw="0" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskEnabled="0" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskType="0" maskOpacity="1"/>
-            <background shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeSizeType="0" shapeRotationType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeOffsetX="0" shapeSizeY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSVGFile="" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM">
-              <symbol frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferColor="255,255,255,255" bufferJoinStyle="128" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferOpacity="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskJoinStyle="128" maskSizeUnits="MM" maskEnabled="0" maskSize="1.5" maskedSymbolLayers="" maskType="0"/>
+            <background shapeJoinStyle="64" shapeBlendMode="0" shapeSizeType="0" shapeOffsetX="0" shapeRotation="0" shapeOffsetY="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeRadiiX="0" shapeDraw="0" shapeRotationType="0" shapeRadiiUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOpacity="1">
+              <symbol name="fillSymbol" clip_to_extent="1" frame_rate="10" is_animated="0" force_rhr="0" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -31433,7 +31282,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer id="" locked="0" enabled="1" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" id="" pass="0" locked="0" enabled="1">
                   <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"/>
@@ -31457,7 +31306,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowScale="100" shadowOffsetDist="1" shadowOffsetUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowScale="100" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31479,13 +31328,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
+        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
+      <LayoutMultiFrame url="" evaluateExpressions="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" type="65648" contentMode="1" maxBreakDistance="10" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties"/>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
           <Option name="atlasRasterFormat" value="png" type="QString"/>
@@ -31511,14 +31375,15 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas sortKey="&quot;group&quot;" filterFeatures="0" pageNameExpression="&quot;name&quot;" coverageLayerName="cone_only_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" sortAscending="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="1" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1"/>
+      <Atlas coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerProvider="virtual" sortKey="&quot;group&quot;" coverageLayerName="cone_only_groups" enabled="1" pageNameExpression="&quot;name&quot;" filterFeatures="0" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" hideCoverage="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <Sensors/>
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.89871642408721897" xmin="18.39262360336048019" ymin="-33.91404092163588047" xmax="18.42086732654766834">
+    <DefaultViewExtent ymax="-33.94090179651766448" xmin="18.39827074155037323" xmax="18.42587305604926584" ymin="-33.9558782781264199">
       <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>
@@ -31532,10 +31397,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -31583,7 +31448,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={98f1cf95-2d66-4e2b-ab42-5f814aa62a83}" destinationFollowsActiveLayer="1" destinationLayer="route_markers_9305d578_0474_45bb_a1f5_0ad3f45bd4d1" autoAddTrackVertices="0" destinationLayerProvider="memory" destinationLayerName="route_markers" autoCommitFeatures="0">
+  <ProjectGpsSettings destinationFollowsActiveLayer="1" autoAddTrackVertices="0" destinationLayer="" autoCommitFeatures="0">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index bba3083..d1f5bef 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index 995e686..942de8c 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 56142b5..e0a8988 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ